spice-gtk: update to 0.35.
This commit is contained in:
Rasmus Thomsen
maxice8
parent
3cad16f2fb
commit
6fd446a483
|
|
@ -0,0 +1,58 @@
|
|||
From a45e8a56e389e41c891eaa204b16dd89e74e2e69 Mon Sep 17 00:00:00 2001
|
||||
From: Frediano Ziglio <fziglio@redhat.com>
|
||||
Date: Thu, 21 Jun 2018 06:52:56 +0100
|
||||
Subject: [PATCH] Fix build for newer LibreSSL
|
||||
|
||||
LibreSSL 2.7 hidden some definition, like OpenSSL 1.1.
|
||||
This fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229044.
|
||||
Original patch from Piotr Kubaj.
|
||||
|
||||
Reported-by: Jack L. <xxjack12xx@gmail.com>
|
||||
Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
|
||||
Acked-by: Christophe Fergeau <cfergeau@redhat.com>
|
||||
Upstream: Yes
|
||||
---
|
||||
src/bio-gio.c | 3 ++-
|
||||
src/spice-channel.c | 3 ++-
|
||||
2 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/bio-gio.c b/src/bio-gio.c
|
||||
index 30aa73b..79ce7f8 100644
|
||||
--- a/src/bio-gio.c
|
||||
+++ b/src/bio-gio.c
|
||||
@@ -23,7 +23,8 @@
|
||||
#include "spice-util.h"
|
||||
#include "bio-gio.h"
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
|
||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
static BIO_METHOD one_static_bio;
|
||||
|
||||
static int BIO_meth_set_read(BIO_METHOD *biom,
|
||||
diff --git a/src/spice-channel.c b/src/spice-channel.c
|
||||
index 6f3ca27..55dcd8e 100644
|
||||
--- a/src/spice-channel.c
|
||||
+++ b/src/spice-channel.c
|
||||
@@ -55,7 +55,8 @@ static void spice_channel_reset_capabilities(SpiceChannel *channel);
|
||||
static void spice_channel_send_migration_handshake(SpiceChannel *channel);
|
||||
static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
|
||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
|
||||
{
|
||||
if (pkey->type != EVP_PKEY_RSA) {
|
||||
--- a/spice-common/common/ssl_verify.c
|
||||
+++ b/spice-common/common/ssl_verify.c
|
||||
@@ -33,7 +33,8 @@
|
||||
#include <string.h>
|
||||
#include <gio/gio.h>
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined (LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || \
|
||||
+ (defined (LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x20700000)
|
||||
static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
|
||||
{
|
||||
return M_ASN1_STRING_data(asn1);
|
||||
|
|
@ -1,38 +1,35 @@
|
|||
# Template file for 'spice-gtk'
|
||||
pkgname=spice-gtk
|
||||
version=0.34
|
||||
revision=4
|
||||
version=0.35
|
||||
revision=1
|
||||
patch_args="-Np1"
|
||||
build_style=gnu-configure
|
||||
configure_args="--disable-static --enable-vala $(vopt_enable gir introspection)
|
||||
configure_args="--disable-static $(vopt_enable vala vala) $(vopt_enable gir introspection)
|
||||
--enable-smartcard=no --enable-usbredir --enable-polkit=yes
|
||||
--enable-lz4=yes --with-usb-ids-path=/usr/share/hwdata/usb.ids
|
||||
--disable-celt051"
|
||||
hostmakedepends="automake pkg-config libtool gettext-devel intltool vala-devel
|
||||
hostmakedepends="pkg-config gettext-devel intltool vala-devel
|
||||
glib-devel spice-protocol $(vopt_if gir gobject-introspection)"
|
||||
makedepends="acl-devel liblz4-devel dbus-glib-devel vala-devel pixman-devel
|
||||
opus-devel libressl-devel libsasl-devel gtk+3-devel pulseaudio-devel
|
||||
libjpeg-turbo-devel polkit-devel libsoup-devel usbredir-devel spice-protocol"
|
||||
libjpeg-turbo-devel polkit-devel libsoup-devel usbredir-devel spice-protocol
|
||||
libglib-devel"
|
||||
depends="hwids"
|
||||
homepage="http://spice-space.org"
|
||||
license="LGPL-2.1"
|
||||
homepage="https://spice-space.org"
|
||||
license="LGPL-2.1-or-laster"
|
||||
short_desc="GTK+ SPICE widget"
|
||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||
distfiles="http://spice-space.org/download/gtk/${pkgname}-${version}.tar.bz2"
|
||||
checksum=e9720e01165f8451c9f3f58ad50e3afb990993b81cc2db86b3661b7ac5b976ee
|
||||
maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
|
||||
distfiles="https://spice-space.org/download/gtk/${pkgname}-${version}.tar.bz2"
|
||||
checksum=b4e6073de5125e2bdecdf1fbe7c9e8c4cabe9c85518889b42f72bf63c8ab9e86
|
||||
|
||||
build_options="gir vala"
|
||||
|
||||
build_options="gir"
|
||||
if [ -z "$CROSS_BUILD" ]; then
|
||||
build_options_default="gir"
|
||||
build_options_default="gir vala"
|
||||
else
|
||||
disable_parallel_build=yes
|
||||
fi
|
||||
|
||||
pre_configure() {
|
||||
autoreconf -if
|
||||
}
|
||||
post_configure() {
|
||||
# Fix wrong path /usr/lib32 when looking for spice.proto
|
||||
find ${wrksrc} -name Makefile -exec sed -i "{}" -e "s;lib32/spice;lib/spice;g" \;
|
||||
}
|
||||
|
||||
spice-gtk-devel_package() {
|
||||
depends="gtk+3-devel pixman-devel libressl-devel ${sourcepkg}-${version}_${revision}"
|
||||
short_desc+=" - development files"
|
||||
|
|
@ -40,10 +37,12 @@ spice-gtk-devel_package() {
|
|||
vmove usr/include
|
||||
vmove usr/lib/pkgconfig
|
||||
vmove usr/lib/*.so
|
||||
vmove usr/share/vala
|
||||
vmove usr/share/gtk-doc
|
||||
if [ "$build_option_gir" ]; then
|
||||
vmove usr/share/gir-1.0
|
||||
fi
|
||||
if [ "$build_option_vala" ]; then
|
||||
vmove usr/share/vala
|
||||
fi
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue