Merge pull request #7253 from Hoshpak/update-spice
Update spice and spice-gtk
This commit is contained in:
commit
794b770740
|
@ -0,0 +1,33 @@
|
||||||
|
--- src/bio-gio.c.orig 2017-08-03 12:09:57.580574783 +0200
|
||||||
|
+++ src/bio-gio.c 2017-08-03 12:10:18.768828015 +0200
|
||||||
|
@@ -23,7 +23,7 @@
|
||||||
|
#include "spice-util.h"
|
||||||
|
#include "bio-gio.h"
|
||||||
|
|
||||||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
static BIO_METHOD one_static_bio;
|
||||||
|
|
||||||
|
static int BIO_meth_set_read(BIO_METHOD *biom,
|
||||||
|
--- src/spice-channel.c.orig 2017-08-03 12:11:21.042572278 +0200
|
||||||
|
+++ src/spice-channel.c 2017-08-03 12:11:45.780867937 +0200
|
||||||
|
@@ -55,7 +55,7 @@
|
||||||
|
static void spice_channel_send_migration_handshake(SpiceChannel *channel);
|
||||||
|
static gboolean channel_connect(SpiceChannel *channel, gboolean tls);
|
||||||
|
|
||||||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
static RSA *EVP_PKEY_get0_RSA(EVP_PKEY *pkey)
|
||||||
|
{
|
||||||
|
if (pkey->type != EVP_PKEY_RSA) {
|
||||||
|
--- spice-common/common/ssl_verify.c.orig 2017-08-03 12:13:04.694811076 +0200
|
||||||
|
+++ spice-common/common/ssl_verify.c 2017-08-03 12:13:17.514964295 +0200
|
||||||
|
@@ -33,7 +33,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <gio/gio.h>
|
||||||
|
|
||||||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
|
||||||
|
{
|
||||||
|
return M_ASN1_STRING_data(asn1);
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'spice-gtk'
|
# Template file for 'spice-gtk'
|
||||||
pkgname=spice-gtk
|
pkgname=spice-gtk
|
||||||
version=0.33
|
version=0.34
|
||||||
revision=3
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static --enable-vala $(vopt_enable gir introspection)
|
configure_args="--disable-static --enable-vala $(vopt_enable gir introspection)
|
||||||
--enable-smartcard=no --enable-usbredir --enable-polkit=yes
|
--enable-smartcard=no --enable-usbredir --enable-polkit=yes
|
||||||
|
@ -18,7 +18,7 @@ license="LGPL-2.1"
|
||||||
short_desc="GTK+ SPICE widget"
|
short_desc="GTK+ SPICE widget"
|
||||||
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
distfiles="http://spice-space.org/download/gtk/${pkgname}-${version}.tar.bz2"
|
distfiles="http://spice-space.org/download/gtk/${pkgname}-${version}.tar.bz2"
|
||||||
checksum=7daf33b786ab8ebc9fe6e7b11745100ee1ab66e61a5811d1d5aabe4d66eaaf39
|
checksum=e9720e01165f8451c9f3f58ad50e3afb990993b81cc2db86b3661b7ac5b976ee
|
||||||
|
|
||||||
build_options="gir"
|
build_options="gir"
|
||||||
if [ -z "$CROSS_BUILD" ]; then
|
if [ -z "$CROSS_BUILD" ]; then
|
||||||
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- spice-common/common/ssl_verify.c.orig 2017-08-03 11:57:02.149307232 +0200
|
||||||
|
+++ spice-common/common/ssl_verify.c 2017-08-03 11:57:29.209630642 +0200
|
||||||
|
@@ -33,7 +33,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <gio/gio.h>
|
||||||
|
|
||||||
|
-#if OPENSSL_VERSION_NUMBER < 0x10100000
|
||||||
|
+#if OPENSSL_VERSION_NUMBER < 0x10100000 || defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
static const unsigned char *ASN1_STRING_get0_data(const ASN1_STRING *asn1)
|
||||||
|
{
|
||||||
|
return M_ASN1_STRING_data(asn1);
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'spice'
|
# Template file for 'spice'
|
||||||
pkgname=spice
|
pkgname=spice
|
||||||
version=0.13.3
|
version=0.13.90
|
||||||
revision=3
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-tunnel --disable-opengl --enable-smartcard
|
configure_args="--disable-tunnel --disable-opengl --enable-smartcard
|
||||||
--with-sasl --disable-static --enable-xinerama --disable-celt051"
|
--with-sasl --disable-static --enable-xinerama --disable-celt051"
|
||||||
|
@ -15,7 +15,7 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
|
||||||
license="GPL-2"
|
license="GPL-2"
|
||||||
homepage="http://www.spice-space.org"
|
homepage="http://www.spice-space.org"
|
||||||
distfiles="http://www.spice-space.org/download/releases/spice-${version}.tar.bz2"
|
distfiles="http://www.spice-space.org/download/releases/spice-${version}.tar.bz2"
|
||||||
checksum=30f710c0e7594e05b6b9cc702be748a69f910a95192ab851d748c256157fb89e
|
checksum=c6293cac25e97001e00538bb368658cd6aba1e7e3fd5e1bfa8c8f237e99bca17
|
||||||
|
|
||||||
post_extract() {
|
post_extract() {
|
||||||
sed -i 's/armv6hl/arm/g' configure # "detects" cpu from triplet.
|
sed -i 's/armv6hl/arm/g' configure # "detects" cpu from triplet.
|
||||||
|
|
Loading…
Reference in New Issue