1 |
commit: b192534cc6d9f3eb07121b7ef3d7f880ac1bcfec |
2 |
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon May 9 16:07:59 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri May 13 20:03:44 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b192534c |
7 |
|
8 |
net-misc/tigervnc: update live ebuild to 1.12 |
9 |
|
10 |
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com> |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
net-misc/tigervnc/tigervnc-9999.ebuild | 96 +++++++++++++++++++++------------- |
14 |
1 file changed, 61 insertions(+), 35 deletions(-) |
15 |
|
16 |
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild |
17 |
index 90b341d3f1e9..903570b2dd06 100644 |
18 |
--- a/net-misc/tigervnc/tigervnc-9999.ebuild |
19 |
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild |
20 |
@@ -2,74 +2,85 @@ |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
EAPI=7 |
24 |
-CMAKE_IN_SOURCE_BUILD=1 |
25 |
|
26 |
-inherit autotools cmake flag-o-matic git-r3 systemd xdg |
27 |
+CMAKE_IN_SOURCE_BUILD=1 |
28 |
+inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg |
29 |
|
30 |
XSERVER_VERSION="21.1.1" |
31 |
|
32 |
DESCRIPTION="Remote desktop viewer display system" |
33 |
-HOMEPAGE="https://www.tigervnc.org" |
34 |
+HOMEPAGE="https://tigervnc.org" |
35 |
SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )" |
36 |
EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/" |
37 |
|
38 |
LICENSE="GPL-2" |
39 |
SLOT="0" |
40 |
KEYWORDS="" |
41 |
-IUSE="dri3 +drm gnutls nls +opengl server xinerama +xorgmodule" |
42 |
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule" |
43 |
|
44 |
CDEPEND=" |
45 |
- virtual/jpeg:0 |
46 |
+ media-libs/libjpeg-turbo:= |
47 |
sys-libs/zlib:= |
48 |
- >=x11-libs/fltk-1.3.1 |
49 |
- sys-libs/pam |
50 |
+ x11-libs/fltk:1 |
51 |
x11-libs/libX11 |
52 |
x11-libs/libXext |
53 |
+ x11-libs/libXi |
54 |
+ x11-libs/libXrandr |
55 |
x11-libs/libXrender |
56 |
- x11-libs/libxcvt |
57 |
x11-libs/pixman |
58 |
gnutls? ( net-libs/gnutls:= ) |
59 |
nls? ( virtual/libiconv ) |
60 |
server? ( |
61 |
+ dev-libs/libbsd |
62 |
+ dev-libs/openssl:0= |
63 |
+ sys-libs/pam |
64 |
x11-libs/libXau |
65 |
x11-libs/libXdamage |
66 |
x11-libs/libXdmcp |
67 |
+ x11-libs/libXfixes |
68 |
x11-libs/libXfont2 |
69 |
x11-libs/libXtst |
70 |
- >=x11-libs/pixman-0.27.2 |
71 |
- >=x11-apps/xauth-1.0.3 |
72 |
+ x11-libs/pixman |
73 |
+ x11-libs/xtrans |
74 |
+ x11-apps/xauth |
75 |
+ x11-apps/xinit |
76 |
+ x11-apps/xkbcomp |
77 |
x11-apps/xsetroot |
78 |
- >=x11-misc/xkeyboard-config-2.4.1-r3 |
79 |
+ x11-misc/xkeyboard-config |
80 |
+ opengl? ( media-libs/libglvnd[X] ) |
81 |
xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* ) |
82 |
- drm? ( x11-libs/libdrm ) |
83 |
- dev-libs/openssl:0= |
84 |
) |
85 |
- xinerama? ( x11-libs/libXinerama ) |
86 |
" |
87 |
|
88 |
-RDEPEND="${CDEPEND}" |
89 |
+RDEPEND="${CDEPEND} |
90 |
+ java? ( virtual/jre:1.8 ) |
91 |
+ server? ( |
92 |
+ dev-lang/perl |
93 |
+ sys-process/psmisc |
94 |
+ )" |
95 |
|
96 |
DEPEND="${CDEPEND} |
97 |
- nls? ( sys-devel/gettext ) |
98 |
- x11-base/xorg-proto |
99 |
- media-libs/fontconfig |
100 |
- x11-libs/libICE |
101 |
- x11-libs/libSM |
102 |
- x11-libs/libXcursor |
103 |
- x11-libs/libXfixes |
104 |
- x11-libs/libXft |
105 |
- x11-libs/libXi |
106 |
+ drm? ( x11-libs/libdrm ) |
107 |
server? ( |
108 |
- dev-libs/libbsd |
109 |
- x11-libs/libxkbfile |
110 |
- x11-libs/libxshmfence |
111 |
- virtual/pkgconfig |
112 |
media-fonts/font-util |
113 |
+ x11-base/xorg-proto |
114 |
+ x11-libs/libxcvt |
115 |
+ x11-libs/libxkbfile |
116 |
x11-misc/util-macros |
117 |
- >=x11-libs/xtrans-1.3.3 |
118 |
- opengl? ( >=media-libs/mesa-10.3.4-r1 ) |
119 |
+ opengl? ( media-libs/mesa ) |
120 |
)" |
121 |
|
122 |
+BDEPEND=" |
123 |
+ virtual/pkgconfig |
124 |
+ nls? ( sys-devel/gettext ) |
125 |
+ " |
126 |
+ |
127 |
+PATCHES=( |
128 |
+ # Restore Java viewer |
129 |
+ "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch |
130 |
+ "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch |
131 |
+) |
132 |
+ |
133 |
src_unpack() { |
134 |
git-r3_src_unpack |
135 |
unpack xorg-server-${XSERVER_VERSION}.tar.xz |
136 |
@@ -100,7 +111,7 @@ src_configure() { |
137 |
local mycmakeargs=( |
138 |
-DENABLE_GNUTLS=$(usex gnutls) |
139 |
-DENABLE_NLS=$(usex nls) |
140 |
- -DBUILD_JAVA=no |
141 |
+ -DBUILD_JAVA=$(usex java) |
142 |
) |
143 |
|
144 |
cmake_src_configure |
145 |
@@ -113,7 +124,6 @@ src_configure() { |
146 |
--disable-config-hal \ |
147 |
--disable-config-udev \ |
148 |
--disable-devel-docs \ |
149 |
- --disable-dmx \ |
150 |
--disable-dri \ |
151 |
$(use_enable dri3) \ |
152 |
--disable-glamor \ |
153 |
@@ -130,7 +140,6 @@ src_configure() { |
154 |
--disable-xorg \ |
155 |
--disable-xvfb \ |
156 |
--disable-xwin \ |
157 |
- --disable-xwayland \ |
158 |
--enable-dri2 \ |
159 |
--with-pic \ |
160 |
--without-dtrace \ |
161 |
@@ -165,10 +174,17 @@ src_install() { |
162 |
rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die |
163 |
fi |
164 |
|
165 |
- newconfd "${FILESDIR}"/${PN}.confd ${PN} |
166 |
- newinitd "${FILESDIR}"/${PN}.initd ${PN} |
167 |
+ newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN} |
168 |
+ newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN} |
169 |
|
170 |
systemd_douserunit unix/vncserver/vncserver@.service |
171 |
+ |
172 |
+ # comment out pam_selinux.so, the server does not start if missing |
173 |
+ # part of bug #746227 |
174 |
+ sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die |
175 |
+ |
176 |
+ # install vncserver to /usr/bin too, see bug #836620 |
177 |
+ dosym -r /usr/libexec/vncserver /usr/bin/vncserver |
178 |
else |
179 |
local f |
180 |
for f in x0vncserver vncconfig; do |
181 |
@@ -177,5 +193,15 @@ src_install() { |
182 |
done |
183 |
rm -r "${ED}"/usr/{sbin,libexec} || die |
184 |
rm -r "${ED}"/usr/share/man/man8 || die |
185 |
+ rm -r "${ED}"/etc || die |
186 |
fi |
187 |
} |
188 |
+ |
189 |
+pkg_postinst() { |
190 |
+ xdg_pkg_postinst |
191 |
+ |
192 |
+ local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim" |
193 |
+ use server && \ |
194 |
+ optfeature_header "Install any additional display manager package:" && \ |
195 |
+ optfeature "proper session support" ${OPTIONAL_DM} |
196 |
+} |