1 |
commit: aabb6b116e78b4e93773e599018811120e5c4ca5 |
2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon May 9 16:10:23 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 13 20:03:45 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabb6b11 |
7 |
|
8 |
net-misc/tigervnc: drop 1.9.0-r2 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/700464 |
11 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/25403 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
net-misc/tigervnc/Manifest | 2 - |
16 |
.../files/tigervnc-1.9.0-030_manpages.patch | 55 ------ |
17 |
.../files/tigervnc-1.9.0-055_xstartup.patch | 33 ---- |
18 |
net-misc/tigervnc/files/tigervnc.confd | 9 - |
19 |
net-misc/tigervnc/files/tigervnc.initd | 72 -------- |
20 |
.../files/xserver120-drmfourcc-header.patch | 36 ---- |
21 |
net-misc/tigervnc/files/xserver120.patch | 91 ---------- |
22 |
net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild | 185 --------------------- |
23 |
8 files changed, 483 deletions(-) |
24 |
|
25 |
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest |
26 |
index 69a6995f580f..272e2edc7499 100644 |
27 |
--- a/net-misc/tigervnc/Manifest |
28 |
+++ b/net-misc/tigervnc/Manifest |
29 |
@@ -1,5 +1,3 @@ |
30 |
DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d |
31 |
DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb |
32 |
-DIST tigervnc-1.9.0.tar.gz 1506520 BLAKE2B 292c2e5fb9ffe2573e216257e889d259abfdca5964559492c318e24ea00563211e7477a4f1b2b09d0e962343d4aeb2c12dcfdd6857a3282882ee9f91fdf8103a SHA512 333910f567e6b5e4a5a22d898b2d4c3f4b834cb4cc8fc13ff55d31401894c0d5122a127692ec5eb51e412c945ff3ea5b8146f9ab22cbe1e47541e09239ec8c9d |
33 |
-DIST xorg-server-1.20.0.tar.bz2 6096838 BLAKE2B 34ee6d6dbbde54d54e082a0791e85ad52d728e239a7d8fadb75ebcbdbaab8752b90ca6d075f096d971db7ec68ce4ecac5c70fcf536ce23c20b8dce8f32e2c046 SHA512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde |
34 |
DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d |
35 |
|
36 |
diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch |
37 |
deleted file mode 100644 |
38 |
index 8a30f18d7d92..000000000000 |
39 |
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-030_manpages.patch |
40 |
+++ /dev/null |
41 |
@@ -1,55 +0,0 @@ |
42 |
-diff --git a/unix/vncserver b/unix/vncserver |
43 |
-index 9e7a6ac5..139f9601 100755 |
44 |
---- a/unix/vncserver |
45 |
-+++ b/unix/vncserver |
46 |
-@@ -684,6 +684,7 @@ sub Usage |
47 |
- " [-geometry <width>x<height>]\n". |
48 |
- " [-pixelformat rgbNNN|bgrNNN]\n". |
49 |
- " [-fp <font-path>]\n". |
50 |
-+ " [-cc <visual>]\n". |
51 |
- " [-fg]\n". |
52 |
- " [-autokill]\n". |
53 |
- " [-noxstartup]\n". |
54 |
-diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx |
55 |
-index f076565f..05669a42 100644 |
56 |
---- a/vncviewer/vncviewer.cxx |
57 |
-+++ b/vncviewer/vncviewer.cxx |
58 |
-@@ -352,6 +352,11 @@ static void usage(const char *programName) |
59 |
- " %s [parameters] -listen [port] [parameters]\n" |
60 |
- " %s [parameters] [.tigervnc file]\n", |
61 |
- programName, programName, programName); |
62 |
-+ fprintf(stderr,"\n" |
63 |
-+ "Options:\n\n" |
64 |
-+ " -display Xdisplay - Specifies the X display for the viewer window\n" |
65 |
-+ " -geometry geometry - Standard X position and sizing specification.\n"); |
66 |
-+ |
67 |
- fprintf(stderr,"\n" |
68 |
- "Parameters can be turned on with -<param> or off with -<param>=0\n" |
69 |
- "Parameters which take a value can be specified as " |
70 |
-diff --git a/vncviewer/vncviewer.man b/vncviewer/vncviewer.man |
71 |
-index 729c01d6..07dc58f1 100644 |
72 |
---- a/vncviewer/vncviewer.man |
73 |
-+++ b/vncviewer/vncviewer.man |
74 |
-@@ -240,6 +240,10 @@ This option specifies the preferred encoding to use from one of "Tight", "ZRLE", |
75 |
- Disable lossy JPEG compression in Tight encoding. Default is off. |
76 |
- . |
77 |
- .TP |
78 |
-+.B \-ImprovedHextile |
79 |
-+Try harder to compress data (default). |
80 |
-+. |
81 |
-+.TP |
82 |
- .B \-QualityLevel \fIlevel\fP |
83 |
- JPEG quality level. 0 = Low, 9 = High. May be adjusted automatically if |
84 |
- \fB-AutoSelect\fP is turned on. Default is 8. |
85 |
-@@ -296,6 +300,11 @@ respectively. |
86 |
- .B \-AlertOnFatalError |
87 |
- Display a dialog with any fatal error before exiting. Default is on. |
88 |
- |
89 |
-+. |
90 |
-+.TP |
91 |
-+.B \-ZlibLevel |
92 |
-+Zlib compression level. |
93 |
-+ |
94 |
- .SH FILES |
95 |
- .TP |
96 |
- $HOME/.vnc/default.tigervnc |
97 |
|
98 |
diff --git a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch b/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch |
99 |
deleted file mode 100644 |
100 |
index 8b50d8ccf159..000000000000 |
101 |
--- a/net-misc/tigervnc/files/tigervnc-1.9.0-055_xstartup.patch |
102 |
+++ /dev/null |
103 |
@@ -1,33 +0,0 @@ |
104 |
-diff --git a/unix/vncserver b/unix/vncserver |
105 |
-index 9e7a6ac5..fff53bdb 100755 |
106 |
---- a/unix/vncserver |
107 |
-+++ b/unix/vncserver |
108 |
-@@ -63,27 +63,7 @@ $defaultXStartup |
109 |
- = ("#!/bin/sh\n\n". |
110 |
- "unset SESSION_MANAGER\n". |
111 |
- "unset DBUS_SESSION_BUS_ADDRESS\n". |
112 |
-- "OS=`uname -s`\n". |
113 |
-- "if [ \$OS = 'Linux' ]; then\n". |
114 |
-- " case \"\$WINDOWMANAGER\" in\n". |
115 |
-- " \*gnome\*)\n". |
116 |
-- " if [ -e /etc/SuSE-release ]; then\n". |
117 |
-- " PATH=\$PATH:/opt/gnome/bin\n". |
118 |
-- " export PATH\n". |
119 |
-- " fi\n". |
120 |
-- " ;;\n". |
121 |
-- " esac\n". |
122 |
-- "fi\n". |
123 |
-- "if [ -x /etc/X11/xinit/xinitrc ]; then\n". |
124 |
-- " exec /etc/X11/xinit/xinitrc\n". |
125 |
-- "fi\n". |
126 |
-- "if [ -f /etc/X11/xinit/xinitrc ]; then\n". |
127 |
-- " exec sh /etc/X11/xinit/xinitrc\n". |
128 |
-- "fi\n". |
129 |
-- "[ -r \$HOME/.Xresources ] && xrdb \$HOME/.Xresources\n". |
130 |
-- "xsetroot -solid grey\n". |
131 |
-- "xterm -geometry 80x24+10+10 -ls -title \"\$VNCDESKTOP Desktop\" &\n". |
132 |
-- "twm &\n"); |
133 |
-+ "exec /etc/X11/xinit/xinitrc\n"); |
134 |
- |
135 |
- $defaultConfig |
136 |
- = ("## Supported server options to pass to vncserver upon invocation can be listed\n". |
137 |
|
138 |
diff --git a/net-misc/tigervnc/files/tigervnc.confd b/net-misc/tigervnc/files/tigervnc.confd |
139 |
deleted file mode 100644 |
140 |
index e651dbbe7889..000000000000 |
141 |
--- a/net-misc/tigervnc/files/tigervnc.confd |
142 |
+++ /dev/null |
143 |
@@ -1,9 +0,0 @@ |
144 |
-# Config file for /etc/init.d/tigervnc |
145 |
- |
146 |
-# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display". |
147 |
-# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space. |
148 |
-# DISPLAYS="myuser:1" |
149 |
- |
150 |
-# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information. |
151 |
-# VNC_OPTS="" |
152 |
- |
153 |
|
154 |
diff --git a/net-misc/tigervnc/files/tigervnc.initd b/net-misc/tigervnc/files/tigervnc.initd |
155 |
deleted file mode 100644 |
156 |
index 06a154257e6f..000000000000 |
157 |
--- a/net-misc/tigervnc/files/tigervnc.initd |
158 |
+++ /dev/null |
159 |
@@ -1,72 +0,0 @@ |
160 |
-#!/sbin/openrc-run |
161 |
-# Copyright 1999-2014 Gentoo Foundation |
162 |
-# Distributed under the terms of the GNU General Public License, v2 or later |
163 |
- |
164 |
-depend() { |
165 |
- need net |
166 |
-} |
167 |
- |
168 |
-checkconfig() { |
169 |
- if [ -n "${DISPLAYS}" ]; then |
170 |
- if [ $1 = "start" ]; then |
171 |
- local user |
172 |
- for user in $DISPLAYS; do |
173 |
- if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then |
174 |
- eerror "There are no passwords defined for user ${user%%:*}." |
175 |
- return 1 |
176 |
- elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then |
177 |
- eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}" |
178 |
- eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" |
179 |
- return 1 |
180 |
- elif [ -e "/tmp/.X${user##*:}-lock" ]; then |
181 |
- eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock" |
182 |
- eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}" |
183 |
- return 1 |
184 |
- fi |
185 |
- done |
186 |
- fi |
187 |
- return 0 |
188 |
- else |
189 |
- eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc' |
190 |
- return 1 |
191 |
- fi |
192 |
-} |
193 |
- |
194 |
-start() { |
195 |
- checkconfig start || return 1 |
196 |
- ebegin "Starting TigerVNC server" |
197 |
- for user in $DISPLAYS; do |
198 |
- usrname=${user%%:*} |
199 |
- usropts=VNC_OPTS_${usrname} |
200 |
- usrdisp=${user##*:} |
201 |
- usrvar=$usropts"["$usrdisp"]" |
202 |
- [ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar} |
203 |
- |
204 |
- # A user may have an invalid shell, so we default to /bin/sh if its the case |
205 |
- if [ -x /usr/bin/getent ] ; then |
206 |
- usrshell=`getent passwd ${user%%:*} | cut -d: -f 7` |
207 |
- case "$usrshell" in |
208 |
- */bash|*/ksh|*/sh|*/csh|*/tcsh) ;; |
209 |
- *) shell="-s /bin/sh" ;; |
210 |
- esac |
211 |
- echo $usrshell $shell |
212 |
- fi |
213 |
- |
214 |
- su ${shell} ${user%%:*} -c "source /etc/profile && cd ~${user%%:*} && vncserver :${user##*:} $vnc_opts" &>/dev/null |
215 |
- done |
216 |
- eend $? |
217 |
-} |
218 |
- |
219 |
-stop() { |
220 |
- checkconfig stop || return 2 |
221 |
- ebegin "Stopping TigerVNC server" |
222 |
- for user in $DISPLAYS; do |
223 |
- su -s /bin/sh ${user%%:*} -c "vncserver -kill :${user##*:}" &>/dev/null |
224 |
- done |
225 |
- eend $? |
226 |
-} |
227 |
- |
228 |
-restart() { |
229 |
- svc_stop |
230 |
- svc_start |
231 |
-} |
232 |
|
233 |
diff --git a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch b/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch |
234 |
deleted file mode 100644 |
235 |
index 4028ebb74518..000000000000 |
236 |
--- a/net-misc/tigervnc/files/xserver120-drmfourcc-header.patch |
237 |
+++ /dev/null |
238 |
@@ -1,36 +0,0 @@ |
239 |
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3.c xorg-server-1.20.0/dri3/dri3.c |
240 |
---- xorg-server-1.20.0.orig/dri3/dri3.c 2018-05-10 09:32:34.000000000 -0700 |
241 |
-+++ xorg-server-1.20.0/dri3/dri3.c 2018-06-13 19:32:52.131915519 -0700 |
242 |
-@@ -26,7 +26,7 @@ |
243 |
- |
244 |
- #include "dri3_priv.h" |
245 |
- |
246 |
--#include <drm_fourcc.h> |
247 |
-+#include <libdrm/drm_fourcc.h> |
248 |
- |
249 |
- static int dri3_request; |
250 |
- DevPrivateKeyRec dri3_screen_private_key; |
251 |
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3_request.c xorg-server-1.20.0/dri3/dri3_request.c |
252 |
---- xorg-server-1.20.0.orig/dri3/dri3_request.c 2018-05-10 09:32:34.000000000 -0700 |
253 |
-+++ xorg-server-1.20.0/dri3/dri3_request.c 2018-06-13 19:33:46.164444267 -0700 |
254 |
-@@ -30,7 +30,7 @@ |
255 |
- #include <xace.h> |
256 |
- #include "../Xext/syncsdk.h" |
257 |
- #include <protocol-versions.h> |
258 |
--#include <drm_fourcc.h> |
259 |
-+#include <libdrm/drm_fourcc.h> |
260 |
- |
261 |
- static Bool |
262 |
- dri3_screen_can_one_point_two(ScreenPtr screen) |
263 |
-diff -urpN xorg-server-1.20.0.orig/dri3/dri3_screen.c xorg-server-1.20.0/dri3/dri3_screen.c |
264 |
---- xorg-server-1.20.0.orig/dri3/dri3_screen.c 2018-05-10 09:32:34.000000000 -0700 |
265 |
-+++ xorg-server-1.20.0/dri3/dri3_screen.c 2018-06-13 19:33:13.885725528 -0700 |
266 |
-@@ -29,7 +29,7 @@ |
267 |
- #include <misync.h> |
268 |
- #include <misyncshm.h> |
269 |
- #include <randrstr.h> |
270 |
--#include <drm_fourcc.h> |
271 |
-+#include <libdrm/drm_fourcc.h> |
272 |
- #include <unistd.h> |
273 |
- |
274 |
- int |
275 |
|
276 |
diff --git a/net-misc/tigervnc/files/xserver120.patch b/net-misc/tigervnc/files/xserver120.patch |
277 |
deleted file mode 100644 |
278 |
index e823a651ae03..000000000000 |
279 |
--- a/net-misc/tigervnc/files/xserver120.patch |
280 |
+++ /dev/null |
281 |
@@ -1,91 +0,0 @@ |
282 |
-diff -urpN xorg-server-1.20.0.orig/configure.ac xorg-server-1.20.0/configure.ac |
283 |
---- xorg-server-1.20.0.orig/configure.ac 2018-05-10 09:32:34.000000000 -0700 |
284 |
-+++ xorg-server-1.20.0/configure.ac 2018-06-13 19:04:47.536413626 -0700 |
285 |
-@@ -74,6 +74,7 @@ dnl forcing an entire recompile.x |
286 |
- AC_CONFIG_HEADERS(include/version-config.h) |
287 |
- |
288 |
- AM_PROG_AS |
289 |
-+AC_PROG_CXX |
290 |
- AC_PROG_LN_S |
291 |
- LT_PREREQ([2.2]) |
292 |
- LT_INIT([disable-static win32-dll]) |
293 |
-@@ -1777,6 +1778,10 @@ if test "x$XVFB" = xyes; then |
294 |
- AC_SUBST([XVFB_SYS_LIBS]) |
295 |
- fi |
296 |
- |
297 |
-+dnl Xvnc DDX |
298 |
-+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XSERVER_CFLAGS"]) |
299 |
-+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB"]) |
300 |
-+AC_SUBST([XVNC_SYS_LIBS], ["$GLX_SYS_LIBS"]) |
301 |
- |
302 |
- dnl Xnest DDX |
303 |
- |
304 |
-@@ -1812,6 +1817,8 @@ if test "x$XORG" = xauto; then |
305 |
- fi |
306 |
- AC_MSG_RESULT([$XORG]) |
307 |
- |
308 |
-+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
309 |
-+ |
310 |
- if test "x$XORG" = xyes; then |
311 |
- XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' |
312 |
- XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' |
313 |
-@@ -2029,7 +2036,6 @@ if test "x$XORG" = xyes; then |
314 |
- AC_DEFINE(XORG_SERVER, 1, [Building Xorg server]) |
315 |
- AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) |
316 |
- AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) |
317 |
-- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) |
318 |
- AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) |
319 |
- AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) |
320 |
- AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) |
321 |
-@@ -2565,6 +2571,7 @@ hw/dmx/Makefile |
322 |
- hw/dmx/man/Makefile |
323 |
- hw/vfb/Makefile |
324 |
- hw/vfb/man/Makefile |
325 |
-+hw/vnc/Makefile |
326 |
- hw/xnest/Makefile |
327 |
- hw/xnest/man/Makefile |
328 |
- hw/xwin/Makefile |
329 |
-diff -urpN xorg-server-1.20.0.orig/hw/Makefile.am xorg-server-1.20.0/hw/Makefile.am |
330 |
---- xorg-server-1.20.0.orig/hw/Makefile.am 2018-05-10 09:32:34.000000000 -0700 |
331 |
-+++ xorg-server-1.20.0/hw/Makefile.am 2018-06-13 19:04:47.536413626 -0700 |
332 |
-@@ -38,7 +38,8 @@ SUBDIRS = \ |
333 |
- $(DMX_SUBDIRS) \ |
334 |
- $(KDRIVE_SUBDIRS) \ |
335 |
- $(XQUARTZ_SUBDIRS) \ |
336 |
-- $(XWAYLAND_SUBDIRS) |
337 |
-+ $(XWAYLAND_SUBDIRS) \ |
338 |
-+ vnc |
339 |
- |
340 |
- DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xwayland |
341 |
- |
342 |
-diff -urpN xorg-server-1.20.0.orig/include/os.h xorg-server-1.20.0/include/os.h |
343 |
---- xorg-server-1.20.0.orig/include/os.h 2018-05-10 09:32:36.000000000 -0700 |
344 |
-+++ xorg-server-1.20.0/include/os.h 2018-06-13 19:04:47.537413618 -0700 |
345 |
-@@ -633,7 +633,7 @@ LogSetDisplay(void); |
346 |
- extern _X_EXPORT void |
347 |
- LogClose(enum ExitCode error); |
348 |
- extern _X_EXPORT Bool |
349 |
--LogSetParameter(LogParameter param, int value); |
350 |
-+LogSetParameter(enum _LogParameter param, int value); |
351 |
- extern _X_EXPORT void |
352 |
- LogVWrite(int verb, const char *f, va_list args) |
353 |
- _X_ATTRIBUTE_PRINTF(2, 0); |
354 |
-diff -urpN xorg-server-1.20.0.orig/mi/miinitext.c xorg-server-1.20.0/mi/miinitext.c |
355 |
---- xorg-server-1.20.0.orig/mi/miinitext.c 2018-05-10 09:32:37.000000000 -0700 |
356 |
-+++ xorg-server-1.20.0/mi/miinitext.c 2018-06-13 19:05:14.742200675 -0700 |
357 |
-@@ -107,8 +107,15 @@ SOFTWARE. |
358 |
- #include "os.h" |
359 |
- #include "globals.h" |
360 |
- |
361 |
-+#ifdef TIGERVNC |
362 |
-+extern void vncExtensionInit(INITARGS); |
363 |
-+#endif |
364 |
-+ |
365 |
- /* List of built-in (statically linked) extensions */ |
366 |
- static const ExtensionModule staticExtensions[] = { |
367 |
-+#ifdef TIGERVNC |
368 |
-+ {vncExtensionInit, "VNC-EXTENSION", NULL}, |
369 |
-+#endif |
370 |
- {GEExtensionInit, "Generic Event Extension", &noGEExtension}, |
371 |
- {ShapeExtensionInit, "SHAPE", NULL}, |
372 |
- #ifdef MITSHM |
373 |
|
374 |
diff --git a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild |
375 |
deleted file mode 100644 |
376 |
index 8b4f9d535a12..000000000000 |
377 |
--- a/net-misc/tigervnc/tigervnc-1.9.0-r2.ebuild |
378 |
+++ /dev/null |
379 |
@@ -1,185 +0,0 @@ |
380 |
-# Copyright 1999-2022 Gentoo Authors |
381 |
-# Distributed under the terms of the GNU General Public License v2 |
382 |
- |
383 |
-EAPI=7 |
384 |
- |
385 |
-CMAKE_IN_SOURCE_BUILD=1 |
386 |
- |
387 |
-inherit autotools cmake flag-o-matic java-pkg-opt-2 systemd xdg |
388 |
- |
389 |
-XSERVER_VERSION="1.20.0" |
390 |
- |
391 |
-DESCRIPTION="Remote desktop viewer display system" |
392 |
-HOMEPAGE="http://www.tigervnc.org" |
393 |
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz |
394 |
- server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )" |
395 |
- |
396 |
-LICENSE="GPL-2" |
397 |
-SLOT="0" |
398 |
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86" |
399 |
-IUSE="dri3 +drm gnutls java nls +opengl pam server xinerama +xorgmodule" |
400 |
- |
401 |
-CDEPEND=" |
402 |
- virtual/jpeg:0 |
403 |
- sys-libs/zlib:= |
404 |
- >=x11-libs/fltk-1.3.1 |
405 |
- gnutls? ( net-libs/gnutls:= ) |
406 |
- nls? ( virtual/libiconv ) |
407 |
- pam? ( sys-libs/pam ) |
408 |
- x11-libs/libX11 |
409 |
- x11-libs/libXext |
410 |
- x11-libs/libXrender |
411 |
- server? ( |
412 |
- x11-libs/libXau |
413 |
- x11-libs/libXdamage |
414 |
- x11-libs/libXdmcp |
415 |
- x11-libs/libXfont2 |
416 |
- x11-libs/libXtst |
417 |
- >=x11-libs/pixman-0.27.2 |
418 |
- >=x11-apps/xauth-1.0.3 |
419 |
- x11-apps/xsetroot |
420 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
421 |
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
422 |
- drm? ( x11-libs/libdrm ) |
423 |
- dev-libs/openssl:0= |
424 |
- ) |
425 |
- xinerama? ( x11-libs/libXinerama ) |
426 |
- " |
427 |
- |
428 |
-RDEPEND="${CDEPEND} |
429 |
- java? ( virtual/jre:1.8 )" |
430 |
- |
431 |
-DEPEND="${CDEPEND} |
432 |
- nls? ( sys-devel/gettext ) |
433 |
- java? ( virtual/jdk:1.8 ) |
434 |
- x11-base/xorg-proto |
435 |
- media-libs/fontconfig |
436 |
- x11-libs/libICE |
437 |
- x11-libs/libSM |
438 |
- x11-libs/libXcursor |
439 |
- x11-libs/libXfixes |
440 |
- x11-libs/libXft |
441 |
- x11-libs/libXi |
442 |
- server? ( |
443 |
- dev-libs/libbsd |
444 |
- x11-libs/libxkbfile |
445 |
- x11-libs/libxshmfence |
446 |
- virtual/pkgconfig |
447 |
- media-fonts/font-util |
448 |
- x11-misc/util-macros |
449 |
- >=x11-libs/xtrans-1.3.3 |
450 |
- opengl? ( >=media-libs/mesa-10.3.4-r1 ) |
451 |
- )" |
452 |
- |
453 |
-PATCHES=( |
454 |
- "${FILESDIR}"/${P}-030_manpages.patch |
455 |
- "${FILESDIR}"/${P}-055_xstartup.patch |
456 |
-) |
457 |
- |
458 |
-src_prepare() { |
459 |
- if use server ; then |
460 |
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die |
461 |
- fi |
462 |
- |
463 |
- # do not rely on the build system to install docs |
464 |
- sed -i 's:^\(install(.* DESTINATION ${DOC_DIR})\):#\1:' \ |
465 |
- cmake/BuildPackages.cmake || die |
466 |
- |
467 |
- cmake_src_prepare |
468 |
- |
469 |
- if use server ; then |
470 |
- cd unix/xserver || die |
471 |
- eapply "${FILESDIR}"/xserver120.patch |
472 |
- eapply "${FILESDIR}"/xserver120-drmfourcc-header.patch |
473 |
- sed -i -e 's/"gl >= .*"/"gl"/' configure.ac || die |
474 |
- eautoreconf |
475 |
- fi |
476 |
-} |
477 |
- |
478 |
-src_configure() { |
479 |
- if use arm || use hppa ; then |
480 |
- append-flags "-fPIC" |
481 |
- fi |
482 |
- |
483 |
- local mycmakeargs=( |
484 |
- -DENABLE_GNUTLS=$(usex gnutls) |
485 |
- -DENABLE_NLS=$(usex nls) |
486 |
- -DENABLE_PAM=$(usex pam) |
487 |
- -DBUILD_JAVA=$(usex java) |
488 |
- ) |
489 |
- |
490 |
- cmake_src_configure |
491 |
- |
492 |
- if use server ; then |
493 |
- cd unix/xserver || die |
494 |
- econf \ |
495 |
- $(use_enable opengl glx) \ |
496 |
- $(use_enable drm libdrm) \ |
497 |
- --disable-config-hal \ |
498 |
- --disable-config-udev \ |
499 |
- --disable-devel-docs \ |
500 |
- --disable-dmx \ |
501 |
- --disable-dri \ |
502 |
- $(use_enable dri3) \ |
503 |
- --disable-glamor \ |
504 |
- --disable-kdrive \ |
505 |
- --disable-libunwind \ |
506 |
- --disable-linux-acpi \ |
507 |
- --disable-record \ |
508 |
- --disable-selective-werror \ |
509 |
- --disable-static \ |
510 |
- --disable-unit-tests \ |
511 |
- --disable-xephyr \ |
512 |
- $(use_enable xinerama) \ |
513 |
- --disable-xnest \ |
514 |
- --disable-xorg \ |
515 |
- --disable-xvfb \ |
516 |
- --disable-xwin \ |
517 |
- --disable-xwayland \ |
518 |
- --enable-dri2 \ |
519 |
- --with-pic \ |
520 |
- --without-dtrace \ |
521 |
- --disable-present \ |
522 |
- --with-sha1=libcrypto |
523 |
- fi |
524 |
-} |
525 |
- |
526 |
-src_compile() { |
527 |
- cmake_src_compile |
528 |
- |
529 |
- if use server ; then |
530 |
- # deps of the vnc module and the module itself |
531 |
- local d subdirs=( |
532 |
- fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render damageext miext Xi xkb |
533 |
- composite dix mi os hw/vnc |
534 |
- ) |
535 |
- for d in "${subdirs[@]}"; do |
536 |
- emake -C unix/xserver/"${d}" |
537 |
- done |
538 |
- fi |
539 |
-} |
540 |
- |
541 |
-src_install() { |
542 |
- cmake_src_install |
543 |
- |
544 |
- if use server ; then |
545 |
- emake -C unix/xserver/hw/vnc DESTDIR="${D}" install |
546 |
- if ! use xorgmodule; then |
547 |
- rm -rv "${ED}"/usr/$(get_libdir)/xorg || die |
548 |
- else |
549 |
- rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
550 |
- fi |
551 |
- |
552 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
553 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
554 |
- |
555 |
- systemd_douserunit contrib/systemd/user/vncserver@.service |
556 |
- else |
557 |
- local f |
558 |
- cd "${ED}" || die |
559 |
- for f in vncserver x0vncserver vncconfig; do |
560 |
- rm usr/bin/$f || die |
561 |
- rm usr/share/man/man1/$f.1 || die |
562 |
- done |
563 |
- fi |
564 |
-} |