From 42228c4e045ccff4ec7bc7b46fdf79c370b57f19 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 4 Jun 2019 18:03:35 +0200 Subject: [PATCH] turbovnc: update to 2.2.2. Signed-off-by: Juan RP --- srcpkgs/turbovnc/patches/fix-libressl.patch | 18 +++++++----------- srcpkgs/turbovnc/template | 6 +++--- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/srcpkgs/turbovnc/patches/fix-libressl.patch b/srcpkgs/turbovnc/patches/fix-libressl.patch index bdfc3094c20..0584ff6a858 100644 --- a/srcpkgs/turbovnc/patches/fix-libressl.patch +++ b/srcpkgs/turbovnc/patches/fix-libressl.patch @@ -1,17 +1,13 @@ -diff --git a/unix/Xvnc/programs/Xserver/hw/vnc/rfb.h b/unix/Xvnc/programs/Xserver/hw/vnc/rfb.h -index 9b82d2f..8c35061 100644 ---- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h -+++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h -@@ -81,6 +81,11 @@ - the CPU count */ - #define MAX_ENCODING_THREADS 8 +--- unix/Xvnc/programs/Xserver/hw/vnc/rfb.h.orig 2019-06-04 18:00:21.482107165 +0200 ++++ unix/Xvnc/programs/Xserver/hw/vnc/rfb.h 2019-06-04 18:00:37.826303493 +0200 +@@ -29,6 +29,10 @@ + #ifndef __RFB_H__ + #define __RFB_H__ +/* Fix for libressl */ +#ifndef OPENSSL_INIT_SETTINGS +#define OPENSSL_INIT_SETTINGS void +#endif -+ - extern const char *display; - - + #ifdef HAVE_DIX_CONFIG_H + #include diff --git a/srcpkgs/turbovnc/template b/srcpkgs/turbovnc/template index 07e9326488a..01909c6c917 100644 --- a/srcpkgs/turbovnc/template +++ b/srcpkgs/turbovnc/template @@ -1,6 +1,6 @@ # Template file for 'turbovnc' pkgname=turbovnc -version=2.2.1 +version=2.2.2 revision=1 build_style=cmake configure_args="-DTJPEG_LIBRARY=/usr/lib/libturbojpeg.so -DTVNC_BUILDJAVA=0 @@ -14,9 +14,9 @@ maintainer="Juan RP " license="GPL-2.0-or-later" homepage="http://virtualgl.org" distfiles="${SOURCEFORGE_SITE}/turbovnc/${pkgname}-${version}.tar.gz" -checksum=d8c710dcf2128c235f8f203ec77b306c56b25d61134b47aeb55acaab4c2d3a61 +checksum=7f1593a3db88dc800d0f82091252ca293b1980a28417b9834ce713eb7e0d09bc -conf_files="/etc/turbovncserver.conf /etc/turbovncserver-security.conf" +conf_files="/etc/*.conf" archs="i686* x86_64* ppc64*" conflicts="tigervnc>=0"