From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/
Date: Wed, 25 Jan 2017 18:05:07 +0000 (UTC) [thread overview]
Message-ID: <1485367480.05604b3b28504cf0bbb91d95c7d7d2441e2fcd40.mattst88@gentoo> (raw)
commit: 05604b3b28504cf0bbb91d95c7d7d2441e2fcd40
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 06:14:30 2017 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 18:04:40 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05604b3b
net-misc/tigervnc: Drop old.
net-misc/tigervnc/Manifest | 4 -
net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch | 78 ---------
net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild | 201 ----------------------
net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild | 180 -------------------
4 files changed, 463 deletions(-)
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 94796da..0e5a2ce 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -1,11 +1,7 @@
-DIST tigervnc-1.3.1-patches-0.1.tar.bz2 16016 SHA256 5bcaabd8993274a5ce1718efc15fdaf22041003a49a94293eeea9b5b72d3b822 SHA512 f7afc3e7062976b704802e58bb654e46ded5f9dcf8e089d1633e82ce8f5383b60885158319142ac8a58d4d0cf0c8fb51134124bb2dd00dc38fb441bc079b31d4 WHIRLPOOL 33c149415633fe4b0c08cd96c9208c70728acc4b2935835bad1c39037af5aec70c54ad9b98503f6ca93441608e3eef82bc3b17dfcdda97f95ae5dbc41cfcd4a4
-DIST tigervnc-1.3.1.tar.gz 6888105 SHA256 628622316eefa5d4f348f00a280a513569bfae3eae6a20d72e2990654d12274e SHA512 28fe61287c4c96b3703055701cb74f7f4cb17392af5201b93fafe5187555710ab4becf110266ea161d26568064435626e85ab7570e1f7f6df2348f1a34d56e8d WHIRLPOOL 35875b230cd4face9a24ae9ff5682c122d7db7a43fe475d9216d30ca9c55409a16788bc6af5e0a2efde3457295f00a3a8f5e29b540477e806be5b0fc30408b99
DIST tigervnc-1.4.2-patches-0.1.tar.bz2 7361 SHA256 21c77708d303192108ffeef02acc0e7310461b4910bb49ae78c8a944e52c436e SHA512 86235aba8e735e4afed21d2940cee8ea2f4f1bc951db79aaf481ae79ab81d4518add6be2619ce9371f77fd068c8dbf069754ecc0168e5afe9e8505d3d61cc573 WHIRLPOOL 97a8c1719e7959ce8abd29f9ad249c7acf1b5a21ef36c0ce00b6e3bae8e6e78e9cdb0b34a23da6bd44c9e513e95f22716b286c5ec57bf1a854101c4810c7b481
DIST tigervnc-1.4.2.tar.gz 1370453 SHA256 6cfb33cb2a123dee96ca29d61523391f73c9d49b6cd2fb6522312d01da98866f SHA512 dcd9b223d0d6646a85b2f28abdf36491d6d735b0738cce0b179d745ca124d8430edd883a7ac7342bf882cf62a02ce8d7058ff9101f17c4310dbbe6bad50cc90f WHIRLPOOL 420dd1f72e1ba0de1796133acf0c35ac1e79bc1533610b927c01993af57eb293a886f57739cca7cf0f1985a269a2ed3cf2345896f59696c8e8dfc68a4b9013e5
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.png 4958 SHA256 e0828aeb92ccaaf93e690e9ee5e17803de1cb140d3ca79fb756fe08ebbc4492e SHA512 97f9a42e9b9f50f1c91de3b7d7991aa8965240fe4958d6da4e9f72f9baa4510ad615765f7c59d6e0a90c9d4b5fe53ad1547c766f2da45e4a6b6e29b03ced2b8b WHIRLPOOL bbf01f6702724bc4329d053bd3fbf856103371abce20f6f74aa3c2e5eed0eebcdcccd287788b1efbb8de3008cb484a8da5ccd1bd667727e4b0861f3bb550529c
-DIST xorg-server-1.16.0.tar.bz2 5832944 SHA256 38330a03c5f7a38745a3f9816cf069db5b8844eebb358fd39dbabf61f32cd06b SHA512 eab298e3728aa79ff2ba3f5c12637c4db0f9bbca49ed00b673b2bfedf605f33a69d8eb946bed98e3d28afd9bfaf62e21ce2e8606d84cae9906506d90c26f1662 WHIRLPOOL bd9817cf93587e2b33d63438942c75d49b04f4fc2a4544654dfcc116deaf88abcccd0fa2496fb58848d5a007d2e32177cdbcd3f44237efd8b7882a0abc5b8d56
DIST xorg-server-1.17.1.tar.bz2 5852385 SHA256 2bf8e9f6f0a710dec1d2472467bff1f4e247cb6dcd76eb469aafdc8a2d7db2ab SHA512 195a0e0a6bd9c7655e62dd40dfbd7dea77d10f1143d4fd6154e8bdbb463d3729f81ecd1e379d66f68e828d4f4583782c15ce260de24444802076844aec552c4f WHIRLPOOL a8a78b0bfa6137941e3434f083319a827f0332fd9c190922bb0a33381e86173868d236c96a89ee3049400f37521fe052838416f009713f004227f05b8717d776
-DIST xorg-server-1.18.0.tar.bz2 5818703 SHA256 195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e SHA512 c7b1403e79e26ea96690f5634eb2fa424f9436a8a3c8a17779f71d254a813ae9b2ff1eb3dc8c6b4c37da125f3108ee86f6f5b1c27c1db6ab28eb6c8ee62e5768 WHIRLPOOL 439cfc2da70f3234facd4684e8ef5cea8b0b2d73251280de4a705bd31c2498df814c189f01ec057da3b810d994dc1e30e1faceec4b059ef428e137c8584450d9
DIST xorg-server-1.18.4.tar.bz2 6009508 SHA256 278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8 SHA512 2055948caa1437547ea823a70d8b24584b65338bb9f1bbf75e3ad7fd60ec9684378facaffa05b7ce496d904213cd192085a43ba889a1476d5fbc813b7e41b56b WHIRLPOOL f9ba5ffb49e6ac7ca20d64d27712a0a8f10c6560256a20e9f944d6438dc5f5eebe53daf6af110084da67a622e92874969047518e72ff181de0d64d83030d629f
diff --git a/net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch b/net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch
deleted file mode 100644
index dd27073..00000000
--- a/net-misc/tigervnc/files/1.3.1-CVE-2014-8240.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Patch-Mainline: To be upstreamed
-References: bnc#900896 CVE-2014-8240
-Signed-off-by: Michal Srb <msrb@suse.com>
-
-Index: tigervnc-1.4.1/unix/x0vncserver/Image.cxx
-===================================================================
---- tigervnc-1.4.1.orig/unix/x0vncserver/Image.cxx
-+++ tigervnc-1.4.1/unix/x0vncserver/Image.cxx
-@@ -80,6 +80,14 @@ void Image::Init(int width, int height)
- xim = XCreateImage(dpy, vis, DefaultDepth(dpy, DefaultScreen(dpy)),
- ZPixmap, 0, 0, width, height, BitmapPad(dpy), 0);
-
-+ if (xim->bytes_per_line <= 0 ||
-+ xim->height <= 0 ||
-+ xim->height >= INT_MAX / xim->bytes_per_line) {
-+ vlog.error("Invalid display size");
-+ XDestroyImage(xim);
-+ exit(1);
-+ }
-+
- xim->data = (char *)malloc(xim->bytes_per_line * xim->height);
- if (xim->data == NULL) {
- vlog.error("malloc() failed");
-@@ -254,6 +262,17 @@ void ShmImage::Init(int width, int heigh
- delete shminfo;
- shminfo = NULL;
- return;
-+ }
-+
-+ if (xim->bytes_per_line <= 0 ||
-+ xim->height <= 0 ||
-+ xim->height >= INT_MAX / xim->bytes_per_line) {
-+ vlog.error("Invalid display size");
-+ XDestroyImage(xim);
-+ xim = NULL;
-+ delete shminfo;
-+ shminfo = NULL;
-+ return;
- }
-
- shminfo->shmid = shmget(IPC_PRIVATE,
-Index: tigervnc-1.4.1/vncviewer/X11PixelBuffer.cxx
-===================================================================
---- tigervnc-1.4.1.orig/vncviewer/X11PixelBuffer.cxx
-+++ tigervnc-1.4.1/vncviewer/X11PixelBuffer.cxx
-@@ -106,6 +106,15 @@ X11PixelBuffer::X11PixelBuffer(int width
- if (!xim)
- throw rfb::Exception(_("Could not create framebuffer image"));
-
-+ if (xim->bytes_per_line <= 0 ||
-+ xim->height <= 0 ||
-+ xim->height >= INT_MAX / xim->bytes_per_line) {
-+ if (xim)
-+ XDestroyImage(xim);
-+ xim = NULL;
-+ throw rfb::Exception("Invalid display size");
-+ }
-+
- xim->data = (char*)malloc(xim->bytes_per_line * xim->height);
- if (!xim->data)
- throw rfb::Exception(_("Not enough memory for framebuffer"));
-@@ -172,6 +181,16 @@ int X11PixelBuffer::setupShm()
- if (!xim)
- goto free_shminfo;
-
-+ if (xim->bytes_per_line <= 0 ||
-+ xim->height <= 0 ||
-+ xim->height >= INT_MAX / xim->bytes_per_line) {
-+ XDestroyImage(xim);
-+ xim = NULL;
-+ delete shminfo;
-+ shminfo = NULL;
-+ throw rfb::Exception("Invalid display size");
-+ }
-+
- shminfo->shmid = shmget(IPC_PRIVATE,
- xim->bytes_per_line * xim->height,
- IPC_CREAT|0777);
diff --git a/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild b/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild
deleted file mode 100644
index f0ff99f..00000000
--- a/net-misc/tigervnc/tigervnc-1.3.1-r4.ebuild
+++ /dev/null
@@ -1,201 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils cmake-utils autotools java-pkg-opt-2 flag-o-matic
-
-PATCHVER="0.1"
-XSERVER_VERSION="1.16.0"
-OPENGL_DIR="xorg-x11"
-#MY_P="${PN}-1.2.80-20130314svn5065"
-#S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Remote desktop viewer display system"
-HOMEPAGE="http://www.tigervnc.org"
-SRC_URI="mirror://sourceforge/tigervnc/${P}.tar.gz
- mirror://gentoo/${PN}.png
- mirror://gentoo/${PN}-1.3.1-patches-${PATCHVER}.tar.bz2
- https://dev.gentoo.org/~armin76/dist/${PN}-1.3.1-patches-${PATCHVER}.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="gnutls java nptl +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.0.8 )
- xorgmodule? ( =x11-base/xorg-server-${XSERVER_VERSION%.*}* )
- )
- !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-7.8_rc[nptl=] )
- )"
-
-CMAKE_IN_SOURCE_BUILD=1
-
-pkg_setup() {
- if ! use server ; then
- echo
- einfo "The 'server' USE flag will build tigervnc's server."
- einfo "If '-server' is chosen only the client is built to save space."
- einfo "Stop the build now if you need to add 'server' to USE flags.\n"
- else
- ewarn "Forcing on xorg-x11 for new enough glxtokens.h..."
- OLD_IMPLEM="$(eselect opengl show)"
- eselect opengl set ${OPENGL_DIR}
- fi
-}
-
-switch_opengl_implem() {
- # Switch to the xorg implementation.
- # Use new opengl-update that will not reset user selected
- # OpenGL interface ...
- echo
- eselect opengl set ${OLD_IMPLEM}
-}
-
-src_prepare() {
- if use server ; then
- cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/* unix/xserver
- else
- rm "${WORKDIR}"/patches/*_server_*
- fi
-
- EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" EPATCH_EXCLUDE="*999*" \
- EPATCH_FORCE="yes" epatch
-
- epatch "${FILESDIR}"/1.3.1-CVE-2014-8240.patch
-
- if use server ; then
- cd unix/xserver
- epatch "${WORKDIR}"/patches/0999_server_xserver-1.14-rebased.patch
- eautoreconf
- fi
-}
-
-src_configure() {
-
- use arm || use hppa && append-flags "-fPIC"
-
- mycmakeargs=(
- -G "Unix Makefiles"
- $(cmake-utils_use_enable gnutls GNUTLS)
- $(cmake-utils_use_enable pam PAM)
- $(cmake-utils_use_build java JAVA)
- )
-
- cmake-utils_src_configure
-
- if use server; then
- cd unix/xserver
- econf \
- $(use_enable nptl glx-tls) \
- $(use_enable opengl glx) \
- --disable-config-hal \
- --disable-config-udev \
- --disable-devel-docs \
- --disable-dmx \
- --disable-dri \
- --disable-dri3 \
- --disable-kdrive \
- --disable-selective-werror \
- --disable-silent-rules \
- --disable-static \
- --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
- cd unix/xserver
- emake
- fi
-}
-
-src_install() {
- cmake-utils_src_install
-
- newicon "${DISTDIR}"/tigervnc.png vncviewer.png
- make_desktop_entry vncviewer vncviewer vncviewer Network
-
- if use server ; then
- cd unix/xserver/hw/vnc
- emake DESTDIR="${D}" install
- ! use xorgmodule && rm -rf "${D}"/usr/$(get_libdir)/xorg
-
- newconfd "${FILESDIR}"/${PN}.confd ${PN}
- newinitd "${FILESDIR}"/${PN}.initd ${PN}
-
- rm "${D}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la
- else
- cd "${D}"
- for f in vncserver vncpasswd x0vncserver vncconfig; do
- rm usr/bin/$f
- rm usr/share/man/man1/$f.1
- done
- fi
-}
-
-pkg_postinst() {
- use server && switch_opengl_implem
-}
diff --git a/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild b/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild
deleted file mode 100644
index bc81240..00000000
--- a/net-misc/tigervnc/tigervnc-1.6.0-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2016 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.0"
-
-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="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%.*}* )
- )
- !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) \
- --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 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
-}
next reply other threads:[~2017-01-25 18:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-25 18:05 Matt Turner [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-09-01 10:56 [gentoo-commits] repo/gentoo:master commit in: net-misc/tigervnc/, net-misc/tigervnc/files/ Viorel Munteanu
2024-07-27 19:36 Viorel Munteanu
2024-06-22 7:57 Viorel Munteanu
2023-08-03 6:00 Viorel Munteanu
2023-06-24 9:08 Viorel Munteanu
2023-05-03 17:06 Viorel Munteanu
2023-03-31 7:03 Viorel Munteanu
2022-05-13 20:04 Sam James
2022-03-22 18:01 Sam James
2021-12-07 23:45 Sam James
2021-09-17 2:34 Sam James
2018-12-15 19:10 Matt Turner
2018-07-23 8:46 Tony Vroon
2017-11-27 15:56 Alice Ferrazzi
2017-03-02 11:12 Michael Palimaka
2017-01-26 10:26 Michael Palimaka
2016-01-29 15:55 Michał Górny
2016-01-09 11:44 Jeroen Roovers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1485367480.05604b3b28504cf0bbb91d95c7d7d2441e2fcd40.mattst88@gentoo \
--to=mattst88@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox