* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2017-02-18 17:53 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2017-02-18 17:53 UTC (permalink / raw
To: gentoo-commits
commit: 567f504e307e99b786a8a0311c575ec41aa4f1fa
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 17:53:19 2017 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 17:53:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=567f504e
net-misc/tigervnc: Security cleanup (bug #606998)
Package-Manager: Portage-2.3.3, Repoman-2.3.1
net-misc/tigervnc/Manifest | 2 -
.../tigervnc/files/tigervnc-1.6.0-xorg118-1.patch | 38 -----
net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild | 182 --------------------
net-misc/tigervnc/tigervnc-1.7.0.ebuild | 185 ---------------------
4 files changed, 407 deletions(-)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 5be3f6ee18..f6a0feedd6 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,6 +1,4 @@
DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
-DIST tigervnc-1.6.0.tar.gz 1291089 SHA256 98ffe98fcfe883e6c35aec579295b53d73d2ccf62e0f6e53a73ecad993b096ca SHA512 b4f1f5116ad5fe27a168764dd746400474e973d2edb85fbbe67a2459824a7267f2c63d1a2b2fdd2811017216c24a7168712df3afece56f404780d386ad24e135 WHIRLPOOL a848148646f6961ea3131cfef773d6108330a1caaa870921d7acd1759dfbe92569a00c385c0f3a35a939b4a2a0215da825cb72b9c820972cc4bf6ada3b29fbec
-DIST tigervnc-1.7.0.tar.gz 1405952 SHA256 4aa704747b4f8f1d59768b663c488fa937e6783db2a46ae407cd2a599cfbf8b1 SHA512 2e673603065ef5cef33fd0e1ab916f5758d29e75ab5fdb18d1cbfacc61f59b85a00c64699d09a91e81de51ccf4006921516d5ea863319bd557fbd378c17ba004 WHIRLPOOL 63565060f42e68d6089f4851b56ff121630d63b14db6a82aac0be3e98aea48d33e35732867a57eb64c212fa3d704e35f3005ea4b0165f003c9be9d187556b668
DIST tigervnc-1.7.1.tar.gz 1406032 SHA256 3c021ec0bee4611020c0bcbab995b0ef2f6f1a46127a52b368827f3275527ccc SHA512 babdc362b28d7af80c7efbb3a1aadf158d7f29621afe36d785748af45e515e2718cf1011359db7b39c218770b3f3ee2767e08abc58091f018c08ba9739a3e68d WHIRLPOOL 178d6b3fb7569cfb2de5dd144031b441b02a865574928d20f1589fd6f933b9276477292182cde56e948ab75d2fc0bea4d79f71bcddb33f6057970a7caa08b2cc
DIST tigervnc.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
diff --git a/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch b/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch
deleted file mode 100644
index ac92e54d0c..0000000000
--- a/net-misc/tigervnc/files/tigervnc-1.6.0-xorg118-1.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Submitted By: Fernando de Oliveira <famobr at yahoo dot com dot br>
-Date: 2015-12-25
-Initial Package Version: xorg-server-1.18.0 (for tigervnc-1.6.0)
-Upstream Status: Not Submitted
-Origin: ArchLinux
-Description: Allow using Xorg-server-1.18.0
-================================================================================
-
-
-================================================================================
-
-diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c
---- tigervnc-1.5.0/unix/xserver/hw/vnc/Input.c 2015-07-11 16:00:36.000000000 +0300
-+++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/Input.c 2015-11-25 19:04:24.278747038 +0300
-@@ -300,6 +300,8 @@
- #if XORG < 111
- n = GetKeyboardEvents(eventq, dev, action, kc);
- enqueueEvents(dev, n);
-+#elif XORG > 117
-+ QueueKeyboardEvents(dev, action, kc);
- #else
- QueueKeyboardEvents(dev, action, kc, NULL);
- #endif
-diff -wbBur tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h
---- tigervnc-1.5.0/unix/xserver/hw/vnc/xorg-version.h 2015-07-11 16:00:36.000000000 +0300
-+++ tigervnc-1.5.0.q/unix/xserver/hw/vnc/xorg-version.h 2015-11-25 19:02:47.688751421 +0300
-@@ -48,8 +48,10 @@
- #define XORG 116
- #elif XORG_VERSION_CURRENT < ((1 * 10000000) + (17 * 100000) + (99 * 1000))
- #define XORG 117
-+#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (18 * 100000) + (99 * 1000))
-+#define XORG 118
- #else
--#error "X.Org newer than 1.17 is not supported"
-+#error "X.Org newer than 1.18 is not supported"
- #endif
-
- #endif
diff --git a/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
deleted file mode 100644
index f5d759fae1..0000000000
--- a/net-misc/tigervnc/tigervnc-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,182 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2
-
-XSERVER_VERSION="1.18.4"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
- mirror://gentoo/${PN}.png
- https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
- server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="+drm gnutls java +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
- sys-libs/zlib
- >=x11-libs/libXtst-1.0.99.2
- >=x11-libs/fltk-1.3.1
- gnutls? ( net-libs/gnutls )
- java? ( >=virtual/jre-1.5:* )
- pam? ( virtual/pam )
- server? (
- dev-lang/perl
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- x11-libs/libXrender
- >=x11-libs/pixman-0.27.2
- >=x11-apps/xauth-1.0.3
- x11-apps/xsetroot
- >=x11-misc/xkeyboard-config-2.4.1-r3
- opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
- drm? ( x11-libs/libdrm )
- )
- !net-misc/vnc
- !net-misc/tightvnc
- !net-misc/xf4vnc"
-DEPEND="${RDEPEND}
- amd64? ( dev-lang/nasm )
- x86? ( dev-lang/nasm )
- >=x11-proto/inputproto-2.2.99.1
- >=x11-proto/xextproto-7.2.99.901
- >=x11-proto/xproto-7.0.26
- java? ( >=virtual/jdk-1.5 )
- server? (
- virtual/pkgconfig
- media-fonts/font-util
- x11-misc/util-macros
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-5.0
- >=x11-proto/fontsproto-2.1.3
- >=x11-proto/glproto-1.4.17
- >=x11-proto/randrproto-1.4.0
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.2.0
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xineramaproto-1.1.3
- >=x11-libs/xtrans-1.3.3
- >=x11-proto/dri2proto-2.8
- opengl? ( >=media-libs/mesa-10.3.4-r1 )
- )"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-src_prepare() {
- if use server ; then
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver
- fi
-
- eapply "${WORKDIR}"/patches/010_libvnc-os.patch
- eapply "${WORKDIR}"/patches/030_manpages.patch
- eapply "${WORKDIR}"/patches/055_xstartup.patch
- eapply "${FILESDIR}"/${P}-xorg118-1.patch
-
- default
-
- if use server ; then
- cd unix/xserver || die
- eapply ../xserver117.patch
- eautoreconf
- fi
-}
-
-src_configure() {
- use arm || use hppa && append-flags "-fPIC"
-
- local mycmakeargs=(
- -DENABLE_GNUTLS=$(usex gnutls)
- -DENABLE_PAM=$(usex pam)
- -DBUILD_JAVA=$(usex java)
- )
-
- cmake-utils_src_configure
-
- if use server; then
- cd unix/xserver || die
- econf \
- $(use_enable opengl glx) \
- $(use_enable drm libdrm) \
- --disable-config-hal \
- --disable-config-udev \
- --disable-devel-docs \
- --disable-dmx \
- --disable-dri \
- --disable-dri3 \
- --disable-glamor \
- --disable-kdrive \
- --disable-libunwind \
- --disable-linux-acpi \
- --disable-record \
- --disable-selective-werror \
- --disable-silent-rules \
- --disable-static \
- --disable-tslib \
- --disable-unit-tests \
- --disable-xephyr \
- --disable-xinerama \
- --disable-xnest \
- --disable-xorg \
- --disable-xvfb \
- --disable-xwin \
- --disable-xwayland \
- --enable-dri2 \
- --with-pic \
- --without-dtrace \
- --disable-present \
- --disable-unit-tests
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use server; then
- # deps of the vnc module and the module itself
- local d subdirs=(
- fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
- composite dix mi os hw/vnc
- )
- for d in "${subdirs[@]}"; do
- emake -C unix/xserver/"${d}"
- done
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon "${DISTDIR}"/tigervnc.png vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer Network
-
- if use server ; then
- emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
- if ! use xorgmodule; then
- rm -r "${D}"/usr/$(get_libdir)/xorg || die
- else
- rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
- fi
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- else
- cd "${D}" || die
- for f in vncserver vncpasswd x0vncserver vncconfig; do
- rm usr/bin/$f || die
- rm usr/share/man/man1/$f.1 || die
- done
- fi
-}
diff --git a/net-misc/tigervnc/tigervnc-1.7.0.ebuild b/net-misc/tigervnc/tigervnc-1.7.0.ebuild
deleted file mode 100644
index c9d586108a..0000000000
--- a/net-misc/tigervnc/tigervnc-1.7.0.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CMAKE_IN_SOURCE_BUILD=1
-
-inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
-
-XSERVER_VERSION="1.18.4"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
- mirror://gentoo/${PN}.png
- https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
- server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
-IUSE="+drm gnutls java +opengl pam server +xorgmodule"
-
-RDEPEND="virtual/jpeg:0
- sys-libs/zlib
- >=x11-libs/libXtst-1.0.99.2
- >=x11-libs/fltk-1.3.1
- gnutls? ( net-libs/gnutls:= )
- java? ( >=virtual/jre-1.5:* )
- pam? ( virtual/pam )
- server? (
- dev-lang/perl
- >=x11-libs/libXi-1.2.99.1
- >=x11-libs/libXfont-1.4.2
- >=x11-libs/libxkbfile-1.0.4
- x11-libs/libXrender
- >=x11-libs/pixman-0.27.2
- >=x11-apps/xauth-1.0.3
- x11-apps/xsetroot
- >=x11-misc/xkeyboard-config-2.4.1-r3
- opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
- drm? ( x11-libs/libdrm )
- )
- !net-misc/vnc
- !net-misc/tightvnc
- !net-misc/xf4vnc"
-DEPEND="${RDEPEND}
- amd64? ( dev-lang/nasm )
- x86? ( dev-lang/nasm )
- >=x11-proto/inputproto-2.2.99.1
- >=x11-proto/xextproto-7.2.99.901
- >=x11-proto/xproto-7.0.26
- java? ( >=virtual/jdk-1.5 )
- server? (
- virtual/pkgconfig
- media-fonts/font-util
- x11-misc/util-macros
- >=x11-proto/bigreqsproto-1.1.0
- >=x11-proto/compositeproto-0.4
- >=x11-proto/damageproto-1.1
- >=x11-proto/fixesproto-5.0
- >=x11-proto/fontsproto-2.1.3
- >=x11-proto/glproto-1.4.17
- >=x11-proto/randrproto-1.4.0
- >=x11-proto/renderproto-0.11
- >=x11-proto/resourceproto-1.2.0
- >=x11-proto/scrnsaverproto-1.1
- >=x11-proto/videoproto-2.2.2
- >=x11-proto/xcmiscproto-1.2.0
- >=x11-proto/xineramaproto-1.1.3
- >=x11-libs/xtrans-1.3.3
- >=x11-proto/dri2proto-2.8
- opengl? ( >=media-libs/mesa-10.3.4-r1 )
- )"
-
-PATCHES=(
- "${WORKDIR}"/patches/010_libvnc-os.patch
- "${WORKDIR}"/patches/030_manpages.patch
- "${WORKDIR}"/patches/055_xstartup.patch
-)
-
-src_prepare() {
- if use server ; then
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
- fi
-
- default
-
- if use server ; then
- cd unix/xserver || die
- eapply ../xserver118.patch
- eautoreconf
- fi
-}
-
-src_configure() {
- use arm || use hppa && append-flags "-fPIC"
-
- local mycmakeargs=(
- -DENABLE_GNUTLS=$(usex gnutls)
- -DENABLE_PAM=$(usex pam)
- -DBUILD_JAVA=$(usex java)
- )
-
- cmake-utils_src_configure
-
- if use server; then
- cd unix/xserver || die
- econf \
- $(use_enable opengl glx) \
- $(use_enable drm libdrm) \
- --disable-config-hal \
- --disable-config-udev \
- --disable-devel-docs \
- --disable-dmx \
- --disable-dri \
- --disable-dri3 \
- --disable-glamor \
- --disable-kdrive \
- --disable-libunwind \
- --disable-linux-acpi \
- --disable-record \
- --disable-selective-werror \
- --disable-silent-rules \
- --disable-static \
- --disable-tslib \
- --disable-unit-tests \
- --disable-xephyr \
- --disable-xinerama \
- --disable-xnest \
- --disable-xorg \
- --disable-xvfb \
- --disable-xwin \
- --disable-xwayland \
- --enable-dri2 \
- --with-pic \
- --without-dtrace \
- --disable-present \
- --disable-unit-tests
- fi
-}
-
-src_compile() {
- cmake-utils_src_compile
-
- if use server; then
- # deps of the vnc module and the module itself
- local d subdirs=(
- fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
- composite dix mi os hw/vnc
- )
- for d in "${subdirs[@]}"; do
- emake -C unix/xserver/"${d}"
- done
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon "${DISTDIR}"/tigervnc.png vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer Network
-
- if use server ; then
- emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
- if ! use xorgmodule; then
- rm -r "${ED%/}"/usr/$(get_libdir)/xorg || die
- else
- rm "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
- fi
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
- systemd_douserunit contrib/systemd/user/vncserver@.service
- else
- local f
- cd "${ED}" || die
- for f in vncserver vncpasswd x0vncserver vncconfig; do
- rm usr/bin/$f || die
- rm usr/share/man/man1/$f.1 || die
- done
- fi
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2017-12-06 12:14 Michael Palimaka
0 siblings, 0 replies; 8+ messages in thread
From: Michael Palimaka @ 2017-12-06 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 2f028f5775ee892397290e2a119cfb87a6f2a041
Author: Takuto Yoshida <otakuto.gentoo <AT> gmail <DOT> com>
AuthorDate: Tue Dec 5 17:44:53 2017 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Dec 6 12:14:08 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f028f57
net-misc/tigervnc: fix encoding option to utf-8, bug #634918 and #610738
And bump internal xorg.
Closes: https://bugs.gentoo.org/610738
Closes: https://bugs.gentoo.org/634918
Closes: https://github.com/gentoo/gentoo/pull/6453
Package-Manager: Portage-2.3.16, Repoman-2.3.6
net-misc/tigervnc/Manifest | 1 +
net-misc/tigervnc/files/java-utf8.patch | 11 ++
net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild | 190 +++++++++++++++++++++++++++++
3 files changed, 202 insertions(+)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index b2eb9321a90..dc284f43c13 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,4 @@
DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 BLAKE2B 5e4aed97f3b1e88488f1f080b11afb515d70fcf5b9a20074436a97b3a54a89bd308bacec5584263a7cd72ef3f8b8863102cbd8ab3685cb3251764f5f23f4a037 SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573
DIST tigervnc-1.8.0.tar.gz 1433830 BLAKE2B bdbe0e11a1459dc6328c7c54e8062f0628b952e33fcbe6ffe93c1b2148b52a17fd99fcae333b2eddf5256ffd0376a83634521473c2cd8937ba95b69bf133c796 SHA512 c066e9781622e342667bf03fd6bbb94ed17b412b07c46764b7b73b2eb308c285e865cf1e901f7d218db05a0486fb3f8877e75da3c939ef0d020247713779327a
DIST xorg-server-1.19.1.tar.bz2 6041792 BLAKE2B 1c67fe74812af15cb77d2e128c92466e11b3da7c984f585cdf58aa5f157a4b254ab2a58ce2f74e87d454ef1e0bf665f2b34a189c98b194c4c5e801b31f006d8c SHA512 37d413fdd96ce6b15ae20ca5028331498586044cfc7a6ab0acb99201b04063c69bcd06867f2dc33237b244ce2870a1c5a4be3cbe4560f2461894f46f8d5dbdd7
+DIST xorg-server-1.19.5.tar.bz2 5965044 BLAKE2B 23375793ea4459a962f412440e307081ce2acd3c646e5db4d1bfac20e267bcbb1752ba8f6de66df06d25eaf92d1b55082a80eced0d44c257a757d5926ca6a7f3 SHA512 928dea5850b98cd815004cfa133eca23cfa9521920c934c68a92787f2cae13cca1534eee772a4fb74b8ae8cb92662b5d68b95b834c8aa8ec57cd57cb4e5dd45c
diff --git a/net-misc/tigervnc/files/java-utf8.patch b/net-misc/tigervnc/files/java-utf8.patch
new file mode 100644
index 00000000000..71bd4503b77
--- /dev/null
+++ b/net-misc/tigervnc/files/java-utf8.patch
@@ -0,0 +1,11 @@
+--- a/java/CMakeLists.txt 2017-10-25 22:26:12.920787580 +0900
++++ b/java/CMakeLists.txt 2017-10-25 22:27:21.423007891 +0900
+@@ -9,7 +9,7 @@ find_package(Java)
+
+ set(DATA_DIR "${CMAKE_INSTALL_PREFIX}/share")
+
+-set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
++set(DEFAULT_JAVACFLAGS "-source 1.6 -target 1.6 -encoding UTF-8 -Xlint:all,-serial,-cast,-unchecked,-fallthrough,-dep-ann,-deprecation,-rawtypes")
+ set(JAVACFLAGS ${DEFAULT_JAVACFLAGS} CACHE STRING
+ "Java compiler flags (Default: ${DEFAULT_JAVACFLAGS})")
+ message(STATUS "Java compiler flags = ${JAVACFLAGS}")
diff --git a/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
new file mode 100644
index 00000000000..745ac50ae66
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.8.0-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit autotools cmake-utils eutils flag-o-matic java-pkg-opt-2 systemd
+
+XSERVER_VERSION="1.19.5"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ https://dev.gentoo.org/~armin76/dist/tigervnc-1.4.2-patches-0.1.tar.bz2
+ server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="+drm gnutls nls java +opengl pam server systemd +xorgmodule"
+
+CDEPEND="virtual/jpeg:0
+ sys-libs/zlib
+ >=x11-libs/libXtst-1.0.99.2
+ >=x11-libs/fltk-1.3.1
+ gnutls? ( net-libs/gnutls:= )
+ nls? ( virtual/libiconv )
+ pam? ( virtual/pam )
+ server? (
+ dev-lang/perl
+ >=x11-libs/libXi-1.2.99.1
+ >=x11-libs/libXfont-1.4.2
+ >=x11-libs/libxkbfile-1.0.4
+ x11-libs/libXrender
+ >=x11-libs/pixman-0.27.2
+ >=x11-apps/xauth-1.0.3
+ x11-apps/xsetroot
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ opengl? ( >=app-eselect/eselect-opengl-1.3.1-r1 )
+ xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+ drm? ( x11-libs/libdrm )
+ )"
+
+RDEPEND="${CDEPEND}
+ !net-misc/tightvnc
+ !net-misc/vnc
+ !net-misc/xf4vnc
+ java? ( >=virtual/jre-1.5:* )"
+
+DEPEND="${CDEPEND}
+ amd64? ( dev-lang/nasm )
+ x86? ( dev-lang/nasm )
+ >=x11-proto/inputproto-2.2.99.1
+ >=x11-proto/xextproto-7.2.99.901
+ >=x11-proto/xproto-7.0.31
+ x11-libs/libXfont2
+ nls? ( sys-devel/gettext )
+ java? ( >=virtual/jdk-1.5 )
+ server? (
+ virtual/pkgconfig
+ media-fonts/font-util
+ x11-misc/util-macros
+ >=x11-proto/bigreqsproto-1.1.0
+ >=x11-proto/compositeproto-0.4
+ >=x11-proto/damageproto-1.1
+ >=x11-proto/fixesproto-5.0
+ >=x11-proto/fontsproto-2.1.3
+ >=x11-proto/glproto-1.4.17
+ >=x11-proto/randrproto-1.4.0
+ >=x11-proto/renderproto-0.11
+ >=x11-proto/resourceproto-1.2.0
+ >=x11-proto/scrnsaverproto-1.1
+ >=x11-proto/videoproto-2.2.2
+ >=x11-proto/xcmiscproto-1.2.0
+ >=x11-proto/xineramaproto-1.1.3
+ >=x11-libs/xtrans-1.3.3
+ >=x11-proto/dri2proto-2.8
+ opengl? ( >=media-libs/mesa-10.3.4-r1 )
+ )"
+
+PATCHES=(
+ "${WORKDIR}"/patches/030_manpages.patch
+ "${WORKDIR}"/patches/055_xstartup.patch
+ "${FILESDIR}"/java-utf8.patch
+)
+
+src_prepare() {
+ if use server ; then
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+ fi
+
+ cmake-utils_src_prepare
+
+ if use server; then
+ cd unix/xserver || die
+ eapply "${FILESDIR}/xserver119.patch"
+ eautoreconf
+ fi
+}
+
+src_configure() {
+ use arm || use hppa && append-flags "-fPIC"
+
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_NLS=$(usex nls)
+ -DENABLE_PAM=$(usex pam)
+ -DBUILD_JAVA=$(usex java)
+ )
+
+ cmake-utils_src_configure
+
+ if use server; then
+ cd unix/xserver || die
+ econf \
+ $(use_enable opengl glx) \
+ $(use_enable drm libdrm) \
+ --disable-config-hal \
+ --disable-config-udev \
+ --disable-devel-docs \
+ --disable-dmx \
+ --disable-dri \
+ --disable-dri3 \
+ --disable-glamor \
+ --disable-kdrive \
+ --disable-libunwind \
+ --disable-linux-acpi \
+ --disable-record \
+ --disable-selective-werror \
+ --disable-silent-rules \
+ --disable-static \
+ --disable-tslib \
+ --disable-unit-tests \
+ --disable-xephyr \
+ --disable-xinerama \
+ --disable-xnest \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xwin \
+ --disable-xwayland \
+ --enable-dri2 \
+ --with-pic \
+ --without-dtrace \
+ --disable-present \
+ --disable-unit-tests
+ fi
+}
+
+src_compile() {
+ cmake-utils_src_compile
+
+ if use server; then
+ # deps of the vnc module and the module itself
+ local d subdirs=(
+ fb xfixes Xext dbe $(usex opengl glx "") randr render damageext miext Xi xkb
+ composite dix mi os hw/vnc
+ )
+ for d in "${subdirs[@]}"; do
+ emake -C unix/xserver/"${d}"
+ done
+ fi
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ if use server; then
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+ if ! use xorgmodule; then
+ rm -rv "${ED%/}"/usr/$(get_libdir)/xorg || die
+ else
+ rm -v "${ED%/}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+ fi
+
+ newconfd "${FILESDIR}"/${PN}.confd ${PN}
+ if use systemd; then
+ systemd_douserunit contrib/systemd/user/vncserver@.service
+ else
+ newinitd "${FILESDIR}"/${PN}.initd ${PN}
+ fi
+ else
+ local f
+ cd "${ED}" || die
+ for f in vncserver x0vncserver vncconfig; do
+ rm usr/bin/$f || die
+ rm usr/share/man/man1/$f.1 || die
+ done
+ fi
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2022-03-18 18:52 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-03-18 18:52 UTC (permalink / raw
To: gentoo-commits
commit: c0660ebeeddda8fb14f5f34f40d467b6e6f288d1
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Fri Feb 18 17:38:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 18 18:51:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0660ebe
net-misc/tigervnc: fix start server with openrc
Add support to override the default Xsession file
Bug: https://bugs.gentoo.org/746227
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/tigervnc-1.12.0-xsession-path.patch | 28 +++
net-misc/tigervnc/files/tigervnc-1.12.0.confd | 15 ++
net-misc/tigervnc/files/tigervnc-1.12.0.initd | 75 ++++++++
net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild | 201 +++++++++++++++++++++
4 files changed, 319 insertions(+)
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
new file mode 100644
index 000000000000..bfcf6ceaef16
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-xsession-path.patch
@@ -0,0 +1,28 @@
+Add more possible paths for Xsession, depending on which display manager is
+installed. We need an Xsession that executes its command line parameters, so
+leave xinit last.
+
+See also https://bugs.gentoo.org/746227
+
+--- a/unix/vncserver/vncserver.in
++++ b/unix/vncserver/vncserver.in
+@@ -437,11 +437,14 @@
+ die "$prog: couldn't find \"$cmd\" on your PATH.\n";
+ }
+
+- foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
+- if (-x "$cmd") {
+- $Xsession = $cmd;
+- last;
+- }
++ $Xsession=$ENV{TIGERVNC_XSESSION_FILE};
++ if (not defined $Xsession) {
++ foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
++ if (-x "$cmd") {
++ $Xsession = $cmd;
++ last;
++ }
++ }
+ }
+ if (not defined $Xsession) {
+ die "$prog: Couldn't find suitable Xsession.\n";
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.confd b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
new file mode 100644
index 000000000000..a65c991eabcc
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.confd
@@ -0,0 +1,15 @@
+# Config file for /etc/init.d/tigervnc
+
+# Specify the user(s) Xvnc(1) should be run for. The syntax is: "username:display".
+# example: "DISPLAYS="foo:1 bar:2" You can specify more users separated by space.
+# DISPLAYS="myuser:1"
+# Do not forget to add them to /etc/tigervnc/vncserver.users too
+
+# Optionally override the default Xsession file
+# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
+
+# Specify any of vncserver(1) and Xvnc(1) options. See the respective man pages for more information.
+# VNC_OPTS=""
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0.initd b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
new file mode 100644
index 000000000000..59da61eed5f7
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0.initd
@@ -0,0 +1,75 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+depend() {
+ need net
+}
+
+checkconfig() {
+ if [ -n "${DISPLAYS}" ]; then
+ if [ $1 = "start" ]; then
+ local user
+ for user in $DISPLAYS; do
+ if eval [ ! -f "~${user%%:*}/.vnc/passwd" ]; then
+ eerror "There are no passwords defined for user ${user%%:*}."
+ return 1
+ elif [ -e "/tmp/.X11-unix/X${user##*:}" ]; then
+ eerror "Display :${user##*:} appears to be already in use because of /tmp/.X11-unix/X${user##*:}"
+ eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
+ return 1
+ elif [ -e "/tmp/.X${user##*:}-lock" ]; then
+ eerror "Display :${user##*:} appears to be already in use because of /tmp/.X${user##*:}-lock"
+ eerror "Remove this file if there is no X server $HOSTNAME:${user##*:}"
+ return 1
+ elif ! grep -E "^[^#]*:${user##*:}=${user%%:*}" /etc/tigervnc/vncserver.users > /dev/null 2>&1; then
+ eerror "User ${user%%:*} is not defined for display :${user##*:} in /etc/tigervnc/vncserver.users"
+ return 1
+ fi
+ done
+ fi
+ return 0
+ else
+ eerror 'Please define $DISPLAYS in /etc/conf.d/tigervnc'
+ return 1
+ fi
+}
+
+start() {
+ checkconfig start || return 1
+ ebegin "Starting TigerVNC server"
+ for user in $DISPLAYS; do
+ usrname=${user%%:*}
+ usropts=VNC_OPTS_${usrname}
+ usrdisp=${user##*:}
+ usrvar=$usropts"["$usrdisp"]"
+ [ -z ${!usrvar} ] && vnc_opts=$VNC_OPTS || vnc_opts=${!usrvar}
+
+ [ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE
+
+ /usr/libexec/vncsession-start :${user##*:} $vnc_opts &>/dev/null
+ done
+ eend $?
+}
+
+stop() {
+ checkconfig stop || return 2
+ ebegin "Stopping TigerVNC server"
+ for user in $DISPLAYS; do
+ # vncserver no longer provides a `-kill` option
+ # killing vncsession does not work, we have to kill Xvnc
+ # run pstree to see exactly what's going on
+ sessionpid=`cat /run/vncsession-\:${user##*:}.pid`
+ serverpid=`pstree -p $sessionpid | grep Xvnc | sed -e 's/^.*Xvnc(//
+ s/).*$//'`
+ kill $serverpid &>/dev/null
+ done
+ # Do not fail if a server is missing
+ /bin/true
+ eend $?
+}
+
+restart() {
+ svc_stop
+ svc_start
+}
diff --git a/net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild
new file mode 100644
index 000000000000..a87123a7d275
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r2.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="http://www.tigervnc.org"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ server? (
+ ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
+ https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch
+ )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+
+CDEPEND="
+ virtual/jpeg:0
+ sys-libs/zlib:=
+ >=x11-libs/fltk-1.3.1
+ sys-libs/pam
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrender
+ x11-libs/pixman
+ gnutls? ( net-libs/gnutls:= )
+ nls? ( virtual/libiconv )
+ server? (
+ x11-libs/libXau
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfont2
+ x11-libs/libXtst
+ >=x11-libs/pixman-0.27.2
+ >=x11-apps/xauth-1.0.3
+ x11-apps/xsetroot
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
+ drm? ( x11-libs/libdrm )
+ dev-libs/openssl:0=
+ )
+ xinerama? ( x11-libs/libXinerama )
+ "
+
+RDEPEND="${CDEPEND}
+ java? ( virtual/jre:1.8 )
+ server? (
+ dev-lang/perl
+ sys-process/psmisc
+ )"
+
+DEPEND="${CDEPEND}
+ nls? ( sys-devel/gettext )
+ java? ( virtual/jdk:1.8 )
+ x11-base/xorg-proto
+ media-libs/fontconfig
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXft
+ x11-libs/libXi
+ server? (
+ dev-libs/libbsd
+ x11-libs/libxkbfile
+ x11-libs/libxshmfence
+ virtual/pkgconfig
+ media-fonts/font-util
+ x11-misc/util-macros
+ >=x11-libs/xtrans-1.3.3
+ opengl? ( >=media-libs/mesa-10.3.4-r1 )
+ )"
+
+PATCHES=(
+ # Restore Java viewer
+ "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+ "${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+)
+
+src_prepare() {
+ if use server; then
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+ eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+ eapply "${DISTDIR}"/${P}-xserver-21.patch
+ fi
+
+ cmake_src_prepare
+
+ if use server; then
+ cd unix/xserver || die
+ eapply ../xserver${XSERVER_VERSION}.patch
+ eautoreconf
+ sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+ sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
+ fi
+}
+
+src_configure() {
+ if use arm || use hppa; then
+ append-flags "-fPIC"
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_NLS=$(usex nls)
+ -DBUILD_JAVA=$(usex java)
+ )
+
+ cmake_src_configure
+
+ if use server; then
+ cd unix/xserver || die
+ econf \
+ $(use_enable opengl glx) \
+ $(use_enable drm libdrm) \
+ --disable-config-hal \
+ --disable-config-udev \
+ --disable-devel-docs \
+ --disable-dri \
+ $(use_enable dri3) \
+ --disable-glamor \
+ --disable-kdrive \
+ --disable-libunwind \
+ --disable-linux-acpi \
+ --disable-record \
+ --disable-selective-werror \
+ --disable-static \
+ --disable-unit-tests \
+ --disable-xephyr \
+ $(use_enable xinerama) \
+ --disable-xnest \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xwin \
+ --enable-dri2 \
+ --with-pic \
+ --without-dtrace \
+ --disable-present \
+ --with-sha1=libcrypto
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use server; then
+ # deps of the vnc module and the module itself
+ local d subdirs=(
+ fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+ damageext miext Xi xkb composite dix mi os hw/vnc
+ )
+ for d in "${subdirs[@]}"; do
+ emake -C unix/xserver/"${d}"
+ done
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ if use server; then
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+ if ! use xorgmodule; then
+ rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
+ else
+ rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+ fi
+
+ newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
+
+ systemd_douserunit unix/vncserver/vncserver@.service
+
+ # comment out pam_selinux.so, the server does not start if missing
+ # part of bug #746227
+ sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+ else
+ local f
+ for f in x0vncserver vncconfig; do
+ rm "${ED}"/usr/bin/${f} || die
+ rm "${ED}"/usr/share/man/man1/${f}.1 || die
+ done
+ rm -r "${ED}"/usr/{sbin,libexec} || die
+ rm -r "${ED}"/usr/share/man/man8 || die
+ fi
+}
+
+pkg_postinst() {
+ local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+
+ use server && \
+ optfeature_header "Install any additional display manager package:" && \
+ optfeature "proper session support" ${OPTIONAL_DM}
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2022-07-04 0:33 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-07-04 0:33 UTC (permalink / raw
To: gentoo-commits
commit: 81782dbff6cb3d7c601a09f3e4cdf84fea4b36c2
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Sat Jun 18 09:53:32 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 00:32:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81782dbf
net-misc/tigervnc: Fix for USE=-server and no pam
Don't build server files instead of erasing them afterwards
Drop xorgmodule local use flag from metadata (no longer used)
Closes: https://bugs.gentoo.org/852830
Signed-off-by: Nick Bowler <nbowler <AT> draconx.ca>
Signed-off-by: Viorel Munteanu <ceamac.paragon <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26034
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tigervnc-1.12.0-disable-server-and-pam.patch | 57 ++++++++++++++++++++++
.../tigervnc-1.12.80-disable-server-and-pam.patch | 57 ++++++++++++++++++++++
net-misc/tigervnc/metadata.xml | 1 -
...ervnc-9999.ebuild => tigervnc-1.12.0-r7.ebuild} | 48 ++++++++----------
net-misc/tigervnc/tigervnc-9999.ebuild | 30 +++++-------
5 files changed, 146 insertions(+), 47 deletions(-)
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
new file mode 100644
index 000000000000..5ae07007d467
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.0-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+ add_subdirectory(java)
+ endif()
+
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+ # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+ check_include_files(security/pam_appl.h HAVE_PAM_H)
+ set(CMAKE_REQUIRED_LIBRARIES -lpam)
+ check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+ add_subdirectory(media)
+ endif()
+
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+ add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
++++ b/common/rfb/CMakeLists.txt
+@@ -75,7 +75,7 @@
+
+ set(RFB_LIBRARIES ${JPEG_LIBRARIES} ${PIXMAN_LIBRARY} os rdr)
+
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+ set(RFB_SOURCES ${RFB_SOURCES} UnixPasswordValidator.cxx
+ UnixPasswordValidator.h pam.c pam.h)
+ set(RFB_LIBRARIES ${RFB_LIBRARIES} ${PAM_LIBS})
+--- a/unix/CMakeLists.txt
++++ b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++ add_subdirectory(vncconfig)
++ add_subdirectory(vncpasswd)
++ add_subdirectory(vncserver)
++ add_subdirectory(x0vncserver)
++endif()
diff --git a/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
new file mode 100644
index 000000000000..e61f099d397a
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.12.80-disable-server-and-pam.patch
@@ -0,0 +1,57 @@
+See https://bugs.gentoo.org/852830
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -234,6 +234,7 @@
+ add_subdirectory(java)
+ endif()
+
++option(BUILD_SERVER "Build TigerVNC server" ON)
+ option(BUILD_VIEWER "Build TigerVNC viewer" ON)
+ if(BUILD_VIEWER)
+ # Check for FLTK
+@@ -276,7 +277,7 @@
+ endif()
+
+ # Check for PAM library
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+ check_include_files(security/pam_appl.h HAVE_PAM_H)
+ set(CMAKE_REQUIRED_LIBRARIES -lpam)
+ check_function_exists(pam_start HAVE_PAM_START)
+@@ -315,9 +316,6 @@
+ add_subdirectory(media)
+ endif()
+
+-add_subdirectory(tests)
+-
+-
+ if(BUILD_VIEWER)
+ add_subdirectory(release)
+ endif()
+--- a/common/rfb/CMakeLists.txt
++++ b/common/rfb/CMakeLists.txt
+@@ -88,7 +88,7 @@
+ target_sources(rfb PRIVATE WinPasswdValidator.cxx)
+ endif(WIN32)
+
+-if(UNIX AND NOT APPLE)
++if(BUILD_SERVER AND UNIX AND NOT APPLE)
+ target_sources(rfb PRIVATE UnixPasswordValidator.cxx pam.c)
+ target_link_libraries(rfb ${PAM_LIBS})
+ endif()
+--- a/unix/CMakeLists.txt
++++ b/unix/CMakeLists.txt
+@@ -1,6 +1,8 @@
+ add_subdirectory(tx)
+ add_subdirectory(common)
+-add_subdirectory(vncconfig)
+-add_subdirectory(vncpasswd)
+-add_subdirectory(vncserver)
+-add_subdirectory(x0vncserver)
++if(BUILD_SERVER)
++ add_subdirectory(vncconfig)
++ add_subdirectory(vncpasswd)
++ add_subdirectory(vncserver)
++ add_subdirectory(x0vncserver)
++endif()
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 9717615f517c..68efa8f862da 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -12,7 +12,6 @@
<use>
<flag name="drm">Build with DRM support</flag>
<flag name="server">Build TigerVNC server</flag>
- <flag name="xorgmodule">Build the Xorg module</flag>
<flag name="dri3">Build with DRI3 support</flag>
</use>
<upstream>
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
similarity index 77%
copy from net-misc/tigervnc/tigervnc-9999.ebuild
copy to net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
index 903570b2dd06..ada6c94f5d44 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.0-r7.ebuild
@@ -4,19 +4,26 @@
EAPI=7
CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
XSERVER_VERSION="21.1.1"
DESCRIPTION="Remote desktop viewer display system"
HOMEPAGE="https://tigervnc.org"
-SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+SRC_URI="https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ server? (
+ ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz
+ https://github.com/TigerVNC/tigervnc/commit/0c5a2b2e7759c2829c07186cfce4d24aa9b5274e.patch -> ${P}-xserver-21.patch
+ )"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+ dri3? ( drm )
+ opengl? ( server )
+"
CDEPEND="
media-libs/libjpeg-turbo:=
@@ -48,7 +55,6 @@ CDEPEND="
x11-apps/xsetroot
x11-misc/xkeyboard-config
opengl? ( media-libs/libglvnd[X] )
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
)
"
@@ -79,16 +85,14 @@ PATCHES=(
# Restore Java viewer
"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+ "${FILESDIR}"/${PN}-1.12.0-disable-server-and-pam.patch
)
-src_unpack() {
- git-r3_src_unpack
- unpack xorg-server-${XSERVER_VERSION}.tar.xz
-}
-
src_prepare() {
if use server; then
cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+ eapply "${FILESDIR}"/${P}-xorg-1.21.patch
+ eapply "${DISTDIR}"/${P}-xserver-21.patch
fi
cmake_src_prepare
@@ -100,7 +104,6 @@ src_prepare() {
sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
fi
- cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
}
src_configure() {
@@ -112,6 +115,7 @@ src_configure() {
-DENABLE_GNUTLS=$(usex gnutls)
-DENABLE_NLS=$(usex nls)
-DBUILD_JAVA=$(usex java)
+ -DBUILD_SERVER=$(usex server)
)
cmake_src_configure
@@ -168,14 +172,10 @@ src_install() {
if use server; then
emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
- if ! use xorgmodule; then
- rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
- else
- rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
- fi
+ rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
- newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
- newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
+ newconfd "${FILESDIR}"/${PN}-${PV}.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-${PV}.initd ${PN}
systemd_douserunit unix/vncserver/vncserver@.service
@@ -185,15 +185,6 @@ src_install() {
# install vncserver to /usr/bin too, see bug #836620
dosym -r /usr/libexec/vncserver /usr/bin/vncserver
- else
- local f
- for f in x0vncserver vncconfig; do
- rm "${ED}"/usr/bin/${f} || die
- rm "${ED}"/usr/share/man/man1/${f}.1 || die
- done
- rm -r "${ED}"/usr/{sbin,libexec} || die
- rm -r "${ED}"/usr/share/man/man8 || die
- rm -r "${ED}"/etc || die
fi
}
@@ -202,6 +193,7 @@ pkg_postinst() {
local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
use server && \
+ optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
optfeature_header "Install any additional display manager package:" && \
optfeature "proper session support" ${OPTIONAL_DM}
}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index 903570b2dd06..437a5aef9438 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -16,7 +16,11 @@ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl server xinerama +xorgmodule"
+IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+REQUIRED_USE="
+ dri3? ( drm )
+ opengl? ( server )
+"
CDEPEND="
media-libs/libjpeg-turbo:=
@@ -48,7 +52,6 @@ CDEPEND="
x11-apps/xsetroot
x11-misc/xkeyboard-config
opengl? ( media-libs/libglvnd[X] )
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
)
"
@@ -79,11 +82,12 @@ PATCHES=(
# Restore Java viewer
"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+ "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
)
src_unpack() {
git-r3_src_unpack
- unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
}
src_prepare() {
@@ -99,8 +103,9 @@ src_prepare() {
eautoreconf
sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
+
+ cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
fi
- cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
}
src_configure() {
@@ -112,6 +117,7 @@ src_configure() {
-DENABLE_GNUTLS=$(usex gnutls)
-DENABLE_NLS=$(usex nls)
-DBUILD_JAVA=$(usex java)
+ -DBUILD_SERVER=$(usex server)
)
cmake_src_configure
@@ -168,11 +174,7 @@ src_install() {
if use server; then
emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
- if ! use xorgmodule; then
- rm -rv "${ED}"/usr/$(get_libdir)/xorg || die
- else
- rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
- fi
+ rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
@@ -185,15 +187,6 @@ src_install() {
# install vncserver to /usr/bin too, see bug #836620
dosym -r /usr/libexec/vncserver /usr/bin/vncserver
- else
- local f
- for f in x0vncserver vncconfig; do
- rm "${ED}"/usr/bin/${f} || die
- rm "${ED}"/usr/share/man/man1/${f}.1 || die
- done
- rm -r "${ED}"/usr/{sbin,libexec} || die
- rm -r "${ED}"/usr/share/man/man8 || die
- rm -r "${ED}"/etc || die
fi
}
@@ -202,6 +195,7 @@ pkg_postinst() {
local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
use server && \
+ optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
optfeature_header "Install any additional display manager package:" && \
optfeature "proper session support" ${OPTIONAL_DM}
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2023-01-15 8:39 Viorel Munteanu
0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2023-01-15 8:39 UTC (permalink / raw
To: gentoo-commits
commit: 61edb13feb920235ca828256639512b68d8de066
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 14 18:50:54 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 08:39:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61edb13f
net-misc/tigervnc: add 1.12.90
This is called "1.13.0 Beta" in their release page, so try to get ready
for "1.13.0": https://github.com/TigerVNC/tigervnc/releases/tag/v1.12.90
Also add viewer USE flag to complement turbovnc. I tested and I can
install and run both combinations of {tiger,turbo}vnc {server,viewer}
Sync live (live is 1.13.80 now)
Bug: https://bugs.gentoo.org/864809
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/tigervnc/Manifest | 1 +
.../files/tigervnc-1.13.80-depend-po-files.patch | 36 +++++++++++
net-misc/tigervnc/metadata.xml | 4 +-
...igervnc-9999.ebuild => tigervnc-1.12.90.ebuild} | 72 +++++++++++++++-------
net-misc/tigervnc/tigervnc-9999.ebuild | 72 +++++++++++++++-------
5 files changed, 138 insertions(+), 47 deletions(-)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 272e2edc7499..d5340081add2 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,3 +1,4 @@
DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
+DIST tigervnc-1.12.90.tar.gz 1963656 BLAKE2B cef93c05dc0e22f67db02d62de276329102b86119263f7224cde7648d8d705ae8f82ec10c7d895a9ae99477cf437038acc3345903b61a1ac30f5649948f9adde SHA512 c9f650e9985ab073042c15f8f3fafd57d5a56b3109c15ffbcfa6ea2fe6c6e56626aa8677415b9826700374d7fbd376e05004921194408604b8550758bd402025
DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
diff --git a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
new file mode 100644
index 000000000000..d611ece53fb1
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
@@ -0,0 +1,36 @@
+Currently the live version does not build because of this dependency. Remove it for now
+
+--- a/vncviewer/CMakeLists.txt
++++ b/vncviewer/CMakeLists.txt
+@@ -81,7 +81,6 @@
+ --desktop --template vncviewer.desktop.in
+ -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+- ${CMAKE_SOURCE_DIR}/po/*.po
+ )
+ elseif(INTLTOOL_MERGE_EXECUTABLE)
+ add_custom_command(OUTPUT vncviewer.desktop
+@@ -93,7 +92,6 @@
+ -d ${CMAKE_SOURCE_DIR}/po
+ vncviewer.desktop.intl vncviewer.desktop
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+- ${CMAKE_SOURCE_DIR}/po/*.po
+ )
+ else()
+ add_custom_command(OUTPUT vncviewer.desktop
+@@ -110,7 +108,6 @@
+ --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+ -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+- ${CMAKE_SOURCE_DIR}/po/*.po
+ )
+ elseif(INTLTOOL_MERGE_EXECUTABLE)
+ add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
+@@ -123,7 +120,6 @@
+ -x ${CMAKE_SOURCE_DIR}/po
+ org.tigervnc.vncviewer.metainfo.xml.intl org.tigervnc.vncviewer.metainfo.xml
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+- ${CMAKE_SOURCE_DIR}/po/*.po
+ )
+ else()
+ add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 09bd90e4d40b..7c4c48e857d6 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -6,9 +6,11 @@
<name>Viorel Munteanu</name>
</maintainer>
<use>
+ <flag name="dri3">Build with DRI3 support</flag>
<flag name="drm">Build with DRM support</flag>
+ <flag name="java">Build TigerVNC Java viewer</flag>
<flag name="server">Build TigerVNC server</flag>
- <flag name="dri3">Build with DRI3 support</flag>
+ <flag name="viewer">Build TigerVNC viewer</flag>
</use>
<upstream>
<remote-id type="github">TigerVNC/tigervnc</remote-id>
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-1.12.90.ebuild
similarity index 75%
copy from net-misc/tigervnc/tigervnc-9999.ebuild
copy to net-misc/tigervnc/tigervnc-1.12.90.ebuild
index d8ae0f70e5f1..fc6cb7d77a07 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.12.90.ebuild
@@ -1,36 +1,44 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
XSERVER_VERSION="21.1.1"
DESCRIPTION="Remote desktop viewer display system"
HOMEPAGE="https://tigervnc.org"
SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+ SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
REQUIRED_USE="
dri3? ( drm )
+ java? ( viewer )
opengl? ( server )
+ || ( server viewer )
"
-CDEPEND="
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+ dev-libs/gmp:=
+ dev-libs/nettle:=
media-libs/libjpeg-turbo:=
sys-libs/zlib:=
- x11-libs/fltk:1
x11-libs/libX11
x11-libs/libXext
- x11-libs/libXi
x11-libs/libXrandr
- x11-libs/libXrender
x11-libs/pixman
gnutls? ( net-libs/gnutls:= )
nls? ( virtual/libiconv )
@@ -52,31 +60,40 @@ CDEPEND="
x11-apps/xsetroot
x11-misc/xkeyboard-config
opengl? ( media-libs/libglvnd[X] )
+ !net-misc/turbovnc[server]
)
- "
-
-RDEPEND="${CDEPEND}
+ viewer? (
+ media-video/ffmpeg:=
+ x11-libs/fltk:1
+ x11-libs/libXi
+ x11-libs/libXrender
+ !net-misc/turbovnc[viewer]
+ )
+"
+RDEPEND="${COMMON_DEPEND}
java? ( virtual/jre:1.8 )
server? (
dev-lang/perl
sys-process/psmisc
- )"
-
-DEPEND="${CDEPEND}
+ )
+"
+DEPEND="${COMMON_DEPEND}
drm? ( x11-libs/libdrm )
server? (
media-fonts/font-util
x11-base/xorg-proto
x11-libs/libxcvt
+ x11-libs/libXi
x11-libs/libxkbfile
+ x11-libs/libXrender
x11-misc/util-macros
opengl? ( media-libs/mesa )
- )"
-
+ )
+"
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
- "
+"
PATCHES=(
# Restore Java viewer
@@ -84,10 +101,15 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
)
+[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
src_unpack() {
- git-r3_src_unpack
- use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ else
+ default
+ fi
}
src_prepare() {
@@ -104,7 +126,10 @@ src_prepare() {
sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
- cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+ if use drm; then
+ cd "${WORKDIR}" && \
+ sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+ fi
fi
}
@@ -118,6 +143,7 @@ src_configure() {
-DENABLE_NLS=$(usex nls)
-DBUILD_JAVA=$(usex java)
-DBUILD_SERVER=$(usex server)
+ -DBUILD_VIEWER=$(usex viewer)
)
cmake_src_configure
@@ -186,7 +212,7 @@ src_install() {
sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
# install vncserver to /usr/bin too, see bug #836620
- dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
+ dosym -r /usr/libexec/vncserver /usr/bin/vncserver
fi
}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index d8ae0f70e5f1..fc6cb7d77a07 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -1,36 +1,44 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
XSERVER_VERSION="21.1.1"
DESCRIPTION="Remote desktop viewer display system"
HOMEPAGE="https://tigervnc.org"
SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+ SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
REQUIRED_USE="
dri3? ( drm )
+ java? ( viewer )
opengl? ( server )
+ || ( server viewer )
"
-CDEPEND="
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+ dev-libs/gmp:=
+ dev-libs/nettle:=
media-libs/libjpeg-turbo:=
sys-libs/zlib:=
- x11-libs/fltk:1
x11-libs/libX11
x11-libs/libXext
- x11-libs/libXi
x11-libs/libXrandr
- x11-libs/libXrender
x11-libs/pixman
gnutls? ( net-libs/gnutls:= )
nls? ( virtual/libiconv )
@@ -52,31 +60,40 @@ CDEPEND="
x11-apps/xsetroot
x11-misc/xkeyboard-config
opengl? ( media-libs/libglvnd[X] )
+ !net-misc/turbovnc[server]
)
- "
-
-RDEPEND="${CDEPEND}
+ viewer? (
+ media-video/ffmpeg:=
+ x11-libs/fltk:1
+ x11-libs/libXi
+ x11-libs/libXrender
+ !net-misc/turbovnc[viewer]
+ )
+"
+RDEPEND="${COMMON_DEPEND}
java? ( virtual/jre:1.8 )
server? (
dev-lang/perl
sys-process/psmisc
- )"
-
-DEPEND="${CDEPEND}
+ )
+"
+DEPEND="${COMMON_DEPEND}
drm? ( x11-libs/libdrm )
server? (
media-fonts/font-util
x11-base/xorg-proto
x11-libs/libxcvt
+ x11-libs/libXi
x11-libs/libxkbfile
+ x11-libs/libXrender
x11-misc/util-macros
opengl? ( media-libs/mesa )
- )"
-
+ )
+"
BDEPEND="
virtual/pkgconfig
nls? ( sys-devel/gettext )
- "
+"
PATCHES=(
# Restore Java viewer
@@ -84,10 +101,15 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
)
+[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
src_unpack() {
- git-r3_src_unpack
- use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ else
+ default
+ fi
}
src_prepare() {
@@ -104,7 +126,10 @@ src_prepare() {
sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
- cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+ if use drm; then
+ cd "${WORKDIR}" && \
+ sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+ fi
fi
}
@@ -118,6 +143,7 @@ src_configure() {
-DENABLE_NLS=$(usex nls)
-DBUILD_JAVA=$(usex java)
-DBUILD_SERVER=$(usex server)
+ -DBUILD_VIEWER=$(usex viewer)
)
cmake_src_configure
@@ -186,7 +212,7 @@ src_install() {
sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
# install vncserver to /usr/bin too, see bug #836620
- dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
+ dosym -r /usr/libexec/vncserver /usr/bin/vncserver
fi
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2024-07-27 19:36 Viorel Munteanu
0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2024-07-27 19:36 UTC (permalink / raw
To: gentoo-commits
commit: 6f4b28e562378215406f8481c84f1ad95062145c
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 19:21:50 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 19:36:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f4b28e5
net-misc/tigervnc: add 1.14.0
Add 1.14.0.
Small changes to configuration files.
Closes: https://bugs.gentoo.org/936442
Closes: https://bugs.gentoo.org/936475
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/tigervnc/Manifest | 1 +
.../files/tigervnc-1.14.0-xsession-path.patch | 28 +++
net-misc/tigervnc/files/tigervnc-1.14.0.confd | 13 ++
net-misc/tigervnc/files/tigervnc-1.14.0.initd | 90 ++++++++
net-misc/tigervnc/tigervnc-1.14.0.ebuild | 235 +++++++++++++++++++++
5 files changed, 367 insertions(+)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 21a2d418a727..783200316a71 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,4 +1,5 @@
DIST tigervnc-1.13.1.tar.gz 1989081 BLAKE2B 3f4d395c2788a4d475dcd42793c43f249264db586da85f99d7e0f64ea37854831c61bb5c99945578f8dbeac5ee30e0f7b46fa7f215768c70e750d50689cd4e7a SHA512 9190dbcd3b57ba52286c158c0675104d68463d7e3ea8e23493514b64451ddb511f3daf0f177339bc231155daea376d9c8dc58216663e10aa12f67468f4559da5
DIST tigervnc-1.13.90.tar.gz 2082778 BLAKE2B 204f2bdc503f4f13ead2cb641c78390763ebc590822d5759fdb3f1c1e052c761ffa443bdbb8f380d5b6b9f45215506bbd1c20d4bae336ee14d9e3621161a182a SHA512 8787d8b18e491df841947b42492e6ac09ed57c72a2b3a1aa901676b7b73bd8dfab5ce45177333913cf66d604804c55357d15eefe5747c31e97b91ce2b9f44093
+DIST tigervnc-1.14.0.tar.gz 2090452 BLAKE2B 5211dadae0ed66b2b286609f2555f45d3d9b45eef738e6deac3193f433ac6b6858ae6245af621d5a001336d91b99237b0a4976e4642111b27f4f668dbcc79803 SHA512 ee36f0aa40957274fb00fd755624a8bea80432d797d6c183645ed1251058ab30594d2261693b5655c5ca85a22e53f93029eeccc51fe86780398d1a017fa2311c
DIST xorg-server-21.1.13.tar.xz 4963952 BLAKE2B f6b05439e54b9709ce7a5b5f3702053ebc586ac8f8976bb6de9955ab34eac7201e027e1076584cf5b6d8c2639703e3a908b9e38f5dc52d4897aac8650f462502 SHA512 a55fbeeed227c12c67f166f2c06a7f4f8d78feeea04c6e73509dbc723185fd0772349aa23f7c44cf0828ac0a0e2f9e4b26cffb220e6dfa7186d60f88b25ccaf1
DIST xorg-server-21.1.8.tar.xz 4980208 BLAKE2B a223efe6d14b55bd133b7f8db75b7720ea0ae58f1eced0f6b20caf6e7045e7649a0923a1c6db5d649265375e6768fa9811477d2fa0da52d7a1e65cf4511535d2 SHA512 6104b3620ed2e1e27d9a8e963388bbe8785a764585b1bc03dbf5d719a92894773dda580d377ca18ceeab353e65a5d23cc947bab84a4012f9dd1eca31cac36937
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0-xsession-path.patch b/net-misc/tigervnc/files/tigervnc-1.14.0-xsession-path.patch
new file mode 100644
index 000000000000..898bd2122eaf
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0-xsession-path.patch
@@ -0,0 +1,28 @@
+Add more possible paths for Xsession, depending on which display manager is
+installed. We need an Xsession that executes its command line parameters, so
+leave xinit last.
+
+See also https://bugs.gentoo.org/746227 and https://bugs.gentoo.org/936475
+
+--- a/unix/vncserver/vncserver.in
++++ b/unix/vncserver/vncserver.in
+@@ -437,11 +437,14 @@
+ die "$prog: couldn't find \"$cmd\" on your PATH.\n";
+ }
+
+- foreach $cmd ("/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
+- if (-x "$cmd") {
+- $Xsession = $cmd;
+- last;
+- }
++ $Xsession=$ENV{TIGERVNC_XSESSION_FILE};
++ if (not defined $Xsession) {
++ foreach $cmd ("/usr/share/sddm/scripts/Xsession", "/etc/gdm/Xsession", "/etc/lightdm/Xsession", "/usr/share/slim/Xsession", "/etc/X11/Sessions/Xsession", "/etc/X11/xinit/Xsession", "/etc/X11/Xsession") {
++ if (-r "$cmd") {
++ $Xsession = $cmd;
++ last;
++ }
++ }
+ }
+ if (not defined $Xsession) {
+ die "$prog: Couldn't find suitable Xsession.\n";
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0.confd b/net-misc/tigervnc/files/tigervnc-1.14.0.confd
new file mode 100644
index 000000000000..9cadc6ab8ae5
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0.confd
@@ -0,0 +1,13 @@
+# Config file for /etc/init.d/tigervnc
+
+# Add the user(s) Xvnc(1) should be run for to /etc/tigervnc/vncserver.users
+# DISPLAYS is no loger used.
+
+# Optionally override the default Xsession file
+# TIGERVNC_XSESSION_FILE="/usr/share/sddm/scripts/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/gdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/etc/lightdm/Xsession"
+# TIGERVNC_XSESSION_FILE="/usr/share/slim/Xsession"
+
+# vncsession no longer supports VNC_OPTS
+# Use /etc/tigervnc/vncserver-config-defaults or $HOME/.config/tigervnc/config instead
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0.initd b/net-misc/tigervnc/files/tigervnc-1.14.0.initd
new file mode 100644
index 000000000000..fa9e4248b304
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0.initd
@@ -0,0 +1,90 @@
+#!/sbin/openrc-run
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License, v2 or later
+
+# shellcheck shell=sh
+
+# Create symlinks for all displays.
+# For example for display :1, run `ln -s tigervnc /etc/init.d/tigervnc.1`
+# Then `rc-update add tigervnc.1 default`
+# For compatibility, /etc/init.d/tigervnc will start all displays.
+
+DISPLAYS=${SVCNAME#*.}
+if [ "$DISPLAYS" = "tigervnc" ]; then
+ should_warn=1
+ DISPLAYS=$(grep -v "^#" /etc/tigervnc/vncserver.users | sed -e 's/=.*//' -e 's/^://')
+fi
+
+depend() {
+ need net
+}
+
+checkconfig() {
+ if [ -n "${DISPLAYS}" ]; then
+ if [ "$1" = "start" ]; then
+ for display in $DISPLAYS; do
+ user="$(grep "^:${display}" /etc/tigervnc/vncserver.users)"
+ user=${user#*=}
+ if [ -z "${user}" ]; then
+ eerror "User is not defined for display :${display} in /etc/tigervnc/vncserver.users"
+ return 1
+ elif [ -e "/tmp/.X11-unix/X${display}" ]; then
+ eerror "Display :${display} appears to be already in use because of /tmp/.X11-unix/X${display}"
+ eerror "Remove this file if there is no X server for :${display}"
+ return 1
+ elif [ -e "/tmp/.X${display}-lock" ]; then
+ eerror "Display :${display} appears to be already in use because of /tmp/.X${display}-lock"
+ eerror "Remove this file if there is no X server for :${display}"
+ return 1
+ # bug #690046
+ # The default config directory is now ~/.config/tigervnc, but still supports ~/.vnc if not found
+ # Only warn if password is missing, do not error out. See bug #936442
+ elif ! runuser -l "${user}" -s /bin/bash -c \
+ "[[ ( -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ${XDG_CONFIG_HOME:-~/.config}/tigervnc/passwd ) || ( ! -d ${XDG_CONFIG_HOME:-~/.config}/tigervnc && -f ~/.vnc/passwd ) ]]"; then
+ ewarn "There are no passwords defined for user ${user}. The server may not start."
+ fi
+ FREEDISPLAYS="${FREEDISPLAYS} ${display}"
+ done
+ fi
+ return 0
+ else
+ eerror 'There are no displays configured in /etc/tigervnc/vncserver.users'
+ return 1
+ fi
+}
+
+checkwarn() {
+ if [ "${should_warn}" = "1" ]; then
+ ewarn 'Running /etc/init.d/tigervnc in compatibility mode'
+ ewarn 'Please migrate to one service per display as detailed here:'
+ ewarn 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+ fi
+}
+
+start() {
+ checkwarn
+ FREEDISPLAYS=""
+ checkconfig start || return 1
+ for display in $FREEDISPLAYS; do
+ [ -n "${TIGERVNC_XSESSION_FILE}" ] && export TIGERVNC_XSESSION_FILE
+ ebegin "Starting TigerVNC server :${display}"
+ start-stop-daemon --start --pidfile=/run/vncsession-":${display}".pid /usr/libexec/vncsession-start -- ":${display}"
+ eend $?
+ done
+}
+
+stop() {
+ checkconfig stop || return 2
+ for display in $DISPLAYS; do
+ ebegin "Stopping TigerVNC server :${display}"
+ start-stop-daemon --stop --pidfile=/run/vncsession-":${display}".pid
+ eend $?
+ done
+ # Do not fail if a server is missing
+ /bin/true
+}
+
+restart() {
+ svc_stop
+ svc_start
+}
diff --git a/net-misc/tigervnc/tigervnc-1.14.0.ebuild b/net-misc/tigervnc/tigervnc-1.14.0.ebuild
new file mode 100644
index 000000000000..dfc8ef4f5e0b
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.14.0.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.13"
+XSERVER_PATCH_VERSION="21"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+ SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+ dri3? ( drm )
+ java? ( viewer )
+ opengl? ( server )
+ || ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+ dev-libs/gmp:=
+ dev-libs/nettle:=
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/pixman
+ gnutls? ( net-libs/gnutls:= )
+ nls? ( virtual/libiconv )
+ server? (
+ dev-libs/openssl:0=
+ sys-libs/pam
+ x11-libs/libXau
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfixes
+ x11-libs/libXfont2
+ x11-libs/libXtst
+ x11-libs/pixman
+ x11-apps/xauth
+ x11-apps/xinit
+ x11-apps/xkbcomp
+ x11-apps/xsetroot
+ x11-misc/xkeyboard-config
+ opengl? ( media-libs/libglvnd[X] )
+ !net-misc/turbovnc[server]
+ )
+ viewer? (
+ media-video/ffmpeg:=
+ x11-libs/fltk:1
+ x11-libs/libXi
+ x11-libs/libXrender
+ !net-misc/turbovnc[viewer]
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+ server? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.8:* )
+ drm? ( x11-libs/libdrm )
+ server? (
+ media-fonts/font-util
+ x11-base/xorg-proto
+ x11-libs/libxcvt
+ x11-libs/libXi
+ x11-libs/libxkbfile
+ x11-libs/libXrender
+ x11-libs/xtrans
+ x11-misc/util-macros
+ opengl? ( media-libs/mesa )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ # Restore Java viewer
+ "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+ "${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
+ "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+)
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ if use server; then
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+ fi
+
+ cmake_src_prepare
+
+ if use server; then
+ cd unix/xserver || die
+ eapply ../xserver${XSERVER_PATCH_VERSION}.patch
+ eautoreconf
+ sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
+
+ if use drm; then
+ cd "${WORKDIR}" && \
+ sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+ fi
+ fi
+}
+
+src_configure() {
+ if use arm || use hppa; then
+ append-flags "-fPIC"
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_NLS=$(usex nls)
+ -DBUILD_JAVA=$(usex java)
+ -DBUILD_SERVER=$(usex server)
+ -DBUILD_VIEWER=$(usex viewer)
+ )
+
+ cmake_src_configure
+
+ if use server; then
+ cd unix/xserver || die
+ econf \
+ $(use_enable opengl glx) \
+ $(use_enable drm libdrm) \
+ --disable-config-hal \
+ --disable-config-udev \
+ --disable-devel-docs \
+ --disable-dri \
+ $(use_enable dri3) \
+ --disable-glamor \
+ --disable-kdrive \
+ --disable-libunwind \
+ --disable-linux-acpi \
+ --disable-record \
+ --disable-selective-werror \
+ --disable-static \
+ --disable-unit-tests \
+ --disable-xephyr \
+ $(use_enable xinerama) \
+ --disable-xnest \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xwin \
+ --enable-dri2 \
+ --with-pic \
+ --without-dtrace \
+ --with-sha1=libcrypto
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use server; then
+ # deps of the vnc module and the module itself
+ local d subdirs=(
+ fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+ damageext miext Xi xkb composite dix mi os present hw/vnc
+ )
+ for d in "${subdirs[@]}"; do
+ emake -C unix/xserver/"${d}"
+ done
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ if use server; then
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+ rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+ newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
+
+ systemd_douserunit unix/vncserver/vncserver@.service
+
+ # comment out pam_selinux.so, the server does not start if missing
+ # part of bug #746227
+ sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+ # install vncserver to /usr/bin too, see bug #836620
+ dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+ elog 'OpenRC users: please migrate to one service per display as documented here:'
+ elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+ elog
+ }
+
+ use server && {
+ elog 'PLEASE NOTE:'
+ elog ' The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
+ elog ' ~/.config/tigervnc instead of ~/.vnc'
+ elog
+ }
+
+ local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+ use server && \
+ optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+ optfeature_header "Install any additional display manager package:" && \
+ optfeature "proper session support" ${OPTIONAL_DM}
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2024-08-30 9:27 Viorel Munteanu
0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2024-08-30 9:27 UTC (permalink / raw
To: gentoo-commits
commit: 11da7edde290e8f2ec626ecb7b14df73ee1b11ce
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 30 06:46:40 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Aug 30 09:13:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11da7edd
net-misc/tigervnc: fix connecting with VncAuth
Fix a typo in a string, looks safe to apply direct to stable.
Closes: https://bugs.gentoo.org/938694
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../files/tigervnc-1.14.0-typo-VncAuth.patch | 21 +++++++++++++++++++++
...rvnc-1.14.0.ebuild => tigervnc-1.14.0-r1.ebuild} | 1 +
2 files changed, 22 insertions(+)
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
new file mode 100644
index 000000000000..8408fb77db5f
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.0-typo-VncAuth.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/938694
+https://github.com/TigerVNC/tigervnc/commit/4f6a3521874da5a67fd746389cfa9b6199eb3582
+
+From 4f6a3521874da5a67fd746389cfa9b6199eb3582 Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Mon, 29 Jul 2024 16:16:08 +0200
+Subject: [PATCH] Add missing comma in default security type list
+
+Otherwise it merges with the next entry, removing both of them from the
+default list.
+--- a/common/rfb/SecurityClient.cxx
++++ b/common/rfb/SecurityClient.cxx
+@@ -60,7 +60,7 @@ StringParameter SecurityClient::secTypes
+ "X509Plain,TLSPlain,X509Vnc,TLSVnc,X509None,TLSNone,"
+ #endif
+ #ifdef HAVE_NETTLE
+- "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII"
++ "RA2,RA2_256,RA2ne,RA2ne_256,DH,MSLogonII,"
+ #endif
+ "VncAuth,None",
+ ConfViewer);
diff --git a/net-misc/tigervnc/tigervnc-1.14.0.ebuild b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
similarity index 99%
rename from net-misc/tigervnc/tigervnc-1.14.0.ebuild
rename to net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
index 858119355b1a..771510fc74c3 100644
--- a/net-misc/tigervnc/tigervnc-1.14.0.ebuild
+++ b/net-misc/tigervnc/tigervnc-1.14.0-r1.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
"${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+ "${FILESDIR}"/${P}-typo-VncAuth.patch # bug #938694
)
src_unpack() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/
@ 2024-10-27 16:43 Viorel Munteanu
0 siblings, 0 replies; 8+ messages in thread
From: Viorel Munteanu @ 2024-10-27 16:43 UTC (permalink / raw
To: gentoo-commits
commit: d3a74ebe692c9e0e90fcc95e95e2b8e82f93f6aa
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 27 16:37:41 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 16:43:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3a74ebe
net-misc/tigervnc: add session for elogind
Upstream supports only systemd; add a session for elogind too.
Bug: https://bugs.gentoo.org/937283
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
net-misc/tigervnc/files/tigervnc-1.14.1-pam.patch | 28 +++
net-misc/tigervnc/tigervnc-1.14.1-r1.ebuild | 236 ++++++++++++++++++++++
2 files changed, 264 insertions(+)
diff --git a/net-misc/tigervnc/files/tigervnc-1.14.1-pam.patch b/net-misc/tigervnc/files/tigervnc-1.14.1-pam.patch
new file mode 100644
index 000000000000..b4630fab5f99
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.14.1-pam.patch
@@ -0,0 +1,28 @@
+Comment out pam_selinux.so, the server does not start if missing.
+Add pam_elogind.so for non-systemd installs.
+
+See also:
+Bug: https://bugs.gentoo.org/746227
+Bug: https://bugs.gentoo.org/937283
+
+--- a/unix/vncserver/tigervnc.pam
++++ b/unix/vncserver/tigervnc.pam
+@@ -1,15 +1,13 @@
+ #%PAM-1.0
+
+-# THIS IS AN EXAMPLE CONFIGURATION
+-# MODIFY AS NEEDED FOR YOUR DISTRIBUTION
+-
+ # pam_selinux.so close should be the first session rule
+--session required pam_selinux.so close
++#-session required pam_selinux.so close
+ session required pam_loginuid.so
+--session required pam_selinux.so open
++#-session required pam_selinux.so open
+ session required pam_namespace.so
+ session optional pam_keyinit.so force revoke
+ session required pam_limits.so
+ -session optional pam_systemd.so
++-session optional pam_elogind.so
+ session required pam_unix.so
+ -session optional pam_reauthorize.so prepare
diff --git a/net-misc/tigervnc/tigervnc-1.14.1-r1.ebuild b/net-misc/tigervnc/tigervnc-1.14.1-r1.ebuild
new file mode 100644
index 000000000000..e77f6a356656
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.14.1-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.13"
+XSERVER_PATCH_VERSION="21"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+ SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+ dri3? ( drm )
+ java? ( viewer )
+ opengl? ( server )
+ || ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+ dev-libs/gmp:=
+ dev-libs/nettle:=
+ media-libs/libjpeg-turbo:=
+ sys-libs/zlib:=
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXrandr
+ x11-libs/pixman
+ gnutls? ( net-libs/gnutls:= )
+ nls? ( virtual/libiconv )
+ server? (
+ dev-libs/openssl:0=
+ sys-libs/pam
+ x11-libs/libXau
+ x11-libs/libxcvt
+ x11-libs/libXdamage
+ x11-libs/libXdmcp
+ x11-libs/libXfixes
+ x11-libs/libXfont2
+ x11-libs/libXtst
+ x11-libs/pixman
+ x11-apps/xauth
+ x11-apps/xinit
+ x11-apps/xkbcomp
+ x11-apps/xsetroot
+ x11-misc/xkeyboard-config
+ dri3? (
+ media-libs/mesa[opengl]
+ x11-libs/libxshmfence
+ )
+ opengl? ( media-libs/libglvnd[X] )
+ !net-misc/turbovnc[server]
+ )
+ viewer? (
+ media-video/ffmpeg:=
+ x11-libs/fltk:1
+ x11-libs/libXi
+ x11-libs/libXrender
+ !net-misc/turbovnc[viewer]
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+ server? ( dev-lang/perl )
+"
+DEPEND="${COMMON_DEPEND}
+ java? ( >=virtual/jdk-1.8:* )
+ drm? ( x11-libs/libdrm )
+ server? (
+ media-fonts/font-util
+ x11-base/xorg-proto
+ x11-libs/libXi
+ x11-libs/libxkbfile
+ x11-libs/libXrender
+ x11-libs/xtrans
+ x11-misc/util-macros
+ opengl? ( media-libs/mesa )
+ )
+"
+BDEPEND="
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ # Restore Java viewer
+ "${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+ "${FILESDIR}"/${PN}-1.14.0-xsession-path.patch
+ "${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+ "${FILESDIR}"/${PN}-1.14.1-pam.patch
+)
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]]; then
+ git-r3_src_unpack
+ use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ if use server; then
+ cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+ fi
+
+ cmake_src_prepare
+
+ if use server; then
+ cd unix/xserver || die
+ eapply ../xserver${XSERVER_PATCH_VERSION}.patch
+ eautoreconf
+ sed -i '/strcmp.*-fakescreenfps/,/^ \}/d' os/utils.c || die
+
+ if use drm; then
+ cd "${WORKDIR}" && \
+ sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+ fi
+ fi
+}
+
+src_configure() {
+ if use arm || use hppa; then
+ append-flags "-fPIC"
+ fi
+
+ local mycmakeargs=(
+ -DENABLE_GNUTLS=$(usex gnutls)
+ -DENABLE_NLS=$(usex nls)
+ -DBUILD_JAVA=$(usex java)
+ -DBUILD_SERVER=$(usex server)
+ -DBUILD_VIEWER=$(usex viewer)
+ )
+
+ cmake_src_configure
+
+ if use server; then
+ cd unix/xserver || die
+ econf \
+ $(use_enable opengl glx) \
+ $(use_enable drm libdrm) \
+ --disable-config-hal \
+ --disable-config-udev \
+ --disable-devel-docs \
+ --disable-dri \
+ $(use_enable dri3) \
+ --disable-glamor \
+ --disable-kdrive \
+ --disable-libunwind \
+ --disable-linux-acpi \
+ --disable-record \
+ --disable-selective-werror \
+ --disable-static \
+ --disable-unit-tests \
+ --disable-xephyr \
+ $(use_enable xinerama) \
+ --disable-xnest \
+ --disable-xorg \
+ --disable-xvfb \
+ --disable-xwin \
+ --enable-dri2 \
+ --with-pic \
+ --without-dtrace \
+ --with-sha1=libcrypto
+ fi
+}
+
+src_compile() {
+ cmake_src_compile
+
+ if use server; then
+ # deps of the vnc module and the module itself
+ local d subdirs=(
+ fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+ damageext miext Xi xkb composite dix mi os present hw/vnc
+ )
+ for d in "${subdirs[@]}"; do
+ emake -C unix/xserver/"${d}"
+ done
+ fi
+}
+
+src_install() {
+ cmake_src_install
+
+ if use server; then
+ emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+ rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+ newconfd "${FILESDIR}"/${PN}-1.14.0.confd ${PN}
+ newinitd "${FILESDIR}"/${PN}-1.14.0.initd ${PN}
+
+ systemd_douserunit unix/vncserver/vncserver@.service
+
+ # install vncserver to /usr/bin too, see bug #836620
+ dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+ fi
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ use server && [[ -n ${REPLACING_VERSIONS} ]] && ver_test "${REPLACING_VERSIONS}" -lt 1.13.1-r3 && {
+ elog 'OpenRC users: please migrate to one service per display as documented here:'
+ elog 'https://wiki.gentoo.org/wiki/TigerVNC#Migrating_from_1.13.1-r2_or_lower:'
+ elog
+ }
+
+ use server && {
+ elog 'PLEASE NOTE:'
+ elog ' The default config directory is now ${XDG_CONFIG_HOME}/tigervnc or'
+ elog ' ~/.config/tigervnc instead of ~/.vnc'
+ elog
+ }
+
+ local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+ use server && \
+ optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+ optfeature_header "Install any additional display manager package:" && \
+ optfeature "proper session support" ${OPTIONAL_DM}
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-10-27 16:43 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-15 8:39 [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/files/, net-misc/tigervnc/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2024-10-27 16:43 Viorel Munteanu
2024-08-30 9:27 Viorel Munteanu
2024-07-27 19:36 Viorel Munteanu
2022-07-04 0:33 Sam James
2022-03-18 18:52 Sam James
2017-12-06 12:14 Michael Palimaka
2017-02-18 17:53 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox