From fce369d44f2b435bbd0db89caaf9976eb829ca49 Mon Sep 17 00:00:00 2001 From: Piraty Date: Wed, 6 May 2020 19:27:13 +0200 Subject: [PATCH] tigervnc: rebuild against nettle-3.6 --- srcpkgs/tigervnc/template | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/srcpkgs/tigervnc/template b/srcpkgs/tigervnc/template index 98b981ecc3..ab30995a2b 100644 --- a/srcpkgs/tigervnc/template +++ b/srcpkgs/tigervnc/template @@ -1,29 +1,29 @@ # Template file for 'tigervnc' pkgname=tigervnc version=1.10.1 -revision=1 +revision=2 _xorg_version=1.20.0 build_style=cmake +hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans" +makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel + xorgproto libxkbfile-devel libXrandr-devel libXfont2-devel gnutls-devel libdrm-devel" +depends="perl xauth xkeyboard-config" short_desc="VNC client forked from TightVNC" maintainer="Evan Deaubl " license="GPL-2.0-or-later" -hostmakedepends="automake gettext xorg-util-macros font-util pkg-config libtool xtrans" -makedepends="fltk-devel zlib-devel libXtst-devel libjpeg-turbo-devel pixman-devel - xorgproto libxkbfile-devel libXfont2-devel gnutls-devel libdrm-devel" -depends="perl xauth xkeyboard-config" -conflicts="turbovnc>=0" homepage="https://www.tigervnc.org" distfiles="https://github.com/TigerVNC/tigervnc/archive/v${version}.tar.gz>tigervnc-${version}.tar.gz ${XORG_SITE}/xserver/xorg-server-${_xorg_version}.tar.bz2" checksum="19fcc80d7d35dd58115262e53cac87d8903180261d94c2a6b0c19224f50b58c4 9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6" +conflicts="turbovnc>=0" post_configure() { cd ${wrksrc}/unix/xserver cp -R ${XBPS_BUILDDIR}/xorg-server-${_xorg_version}/* . patch -p1 <../xserver120.patch # glvnd changed versioning - sed -i '/LIBGL/s/[79]\..\.0/1.2/' configure.ac + vsed -i configure.ac -e '/LIBGL/s/[79]\..\.0/1.2/' autoreconf -fi ./configure --host=${XBPS_CROSS_TRIPLET} --prefix=/usr \ --with-pic --without-dtrace --disable-static \ @@ -36,7 +36,7 @@ post_configure() { # Hardcodes TIGERVNC_BUILDDIR which we have to set later on because # we do out of source builds - sed "s/TIGERVNC_BUILDDIR =/TIGERVNC_BUILDDIR :=/" -i hw/vnc/Makefile + vsed -i hw/vnc/Makefile -e "s/TIGERVNC_BUILDDIR =/TIGERVNC_BUILDDIR :=/" } post_build() {