Update to spice-gtk-0.34.

This commit is contained in:
ajacoutot 2017-12-02 18:10:18 +00:00
parent 91da4e637e
commit 53ac7f11ac
6 changed files with 62 additions and 21 deletions

View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.35 2017/11/21 00:13:05 naddy Exp $
# $OpenBSD: Makefile,v 1.36 2017/12/02 18:10:18 ajacoutot Exp $
COMMENT= GTK client and libraries for SPICE remote desktop servers
DISTNAME= spice-gtk-0.33
REVISION= 5
DISTNAME= spice-gtk-0.34
CATEGORIES= x11 net
SHARED_LIBS += spice-client-glib-2.0 3.3 # 13.0
SHARED_LIBS += spice-client-glib-2.0 4.0 # 14.0
SHARED_LIBS += spice-client-gtk-3.0 2.1 # 5.0
SHARED_LIBS += spice-controller 1.2 # 0.0
@ -15,16 +14,17 @@ HOMEPAGE= http://www.spice-space.org/page/Spice-Gtk
# LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
WANTLIB = FLAC ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0 atk-bridge-2.0
WANTLIB += atspi c cairo cairo-gobject crypto dbus-1 epoxy execinfo
WANTLIB += expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gstapp-1.0
WANTLIB += gstaudio-1.0 gstbase-1.0 gstreamer-1.0 gsttag-1.0
WANTLIB += gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz iconv intl jpeg lz4 m
WANTLIB += ogg opus orc-0.4 pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
WANTLIB += pixman-1 png pthread pulse pulse-mainloop-glib sasl2 sndfile
WANTLIB += ssl vorbis vorbisenc xcb xcb-render xcb-shm z
WANTLIB += FLAC ICE SM X11 X11-xcb Xcomposite Xcursor Xdamage
WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender Xtst atk-1.0
WANTLIB += atk-bridge-2.0 atspi c cairo cairo-gobject crypto dbus-1
WANTLIB += epoxy execinfo expat ffi fontconfig freetype gdk-3
WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
WANTLIB += graphite2 gstapp-1.0 gstaudio-1.0 gstbase-1.0 gstreamer-1.0
WANTLIB += gsttag-1.0 gstvideo-1.0 gthread-2.0 gtk-3 harfbuzz
WANTLIB += iconv intl jpeg lz4 m ogg opus orc-0.4 pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pulse pulse-mainloop-glib
WANTLIB += sasl2 sndfile ssl vorbis vorbisenc xcb xcb-render xcb-shm
WANTLIB += z
MASTER_SITES= ${HOMEPAGE}/../../download/gtk/
EXTRACT_SUFX= .tar.bz2

View File

@ -1,2 +1,2 @@
SHA256 (spice-gtk-0.33.tar.bz2) = fa8zt4arjryf5uexF0UQDuGrZuYaWBHR1aq+TWbqrzk=
SIZE (spice-gtk-0.33.tar.bz2) = 1383927
SHA256 (spice-gtk-0.34.tar.bz2) = 6XIOARZfhFHJ8/WK1Q46+5kJk7gcwtuGs2YbesW5du4=
SIZE (spice-gtk-0.34.tar.bz2) = 1480566

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-spice-common_common_ssl_verify_c,v 1.1 2017/12/02 18:10:18 ajacoutot Exp $
Index: spice-common/common/ssl_verify.c
--- spice-common/common/ssl_verify.c.orig
+++ spice-common/common/ssl_verify.c
@@ -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);

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_bio-gio_c,v 1.1 2017/12/02 18:10:18 ajacoutot Exp $
Index: src/bio-gio.c
--- src/bio-gio.c.orig
+++ src/bio-gio.c
@@ -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,

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_spice-channel_c,v 1.1 2017/12/02 18:10:18 ajacoutot Exp $
Index: src/spice-channel.c
--- src/spice-channel.c.orig
+++ src/spice-channel.c
@@ -55,7 +55,7 @@ static void spice_channel_reset_capabilities(SpiceChan
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) {

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2016/10/15 19:05:18 jasper Exp $
@comment $OpenBSD: PLIST,v 1.11 2017/12/02 18:10:18 ajacoutot Exp $
@bin bin/spicy
@bin bin/spicy-screenshot
@bin bin/spicy-stats
@ -57,8 +57,10 @@ share/gtk-doc/html/spice-gtk/
share/gtk-doc/html/spice-gtk/SpiceAudio.html
share/gtk-doc/html/spice-gtk/SpiceChannel.html
share/gtk-doc/html/spice-gtk/SpiceCursorChannel.html
share/gtk-doc/html/spice-gtk/SpiceDisplay.html
share/gtk-doc/html/spice-gtk/SpiceDisplayChannel.html
share/gtk-doc/html/spice-gtk/SpiceFileTransferTask.html
share/gtk-doc/html/spice-gtk/SpiceGtkSession.html
share/gtk-doc/html/spice-gtk/SpiceInputsChannel.html
share/gtk-doc/html/spice-gtk/SpiceMainChannel.html
share/gtk-doc/html/spice-gtk/SpicePlaybackChannel.html
@ -68,10 +70,10 @@ share/gtk-doc/html/spice-gtk/SpiceSession.html
share/gtk-doc/html/spice-gtk/SpiceSmartcardChannel.html
share/gtk-doc/html/spice-gtk/SpiceSmartcardManager.html
share/gtk-doc/html/spice-gtk/SpiceUsbDeviceManager.html
share/gtk-doc/html/spice-gtk/SpiceUsbDeviceWidget.html
share/gtk-doc/html/spice-gtk/SpiceUsbredirChannel.html
share/gtk-doc/html/spice-gtk/SpiceWebdavChannel.html
share/gtk-doc/html/spice-gtk/annotation-glossary.html
share/gtk-doc/html/spice-gtk/api-index-deprecated.html
share/gtk-doc/html/spice-gtk/api-index-full.html
share/gtk-doc/html/spice-gtk/api-reference.html
share/gtk-doc/html/spice-gtk/application-support.html
@ -85,10 +87,7 @@ share/gtk-doc/html/spice-gtk/left.png
share/gtk-doc/html/spice-gtk/object-tree.html
share/gtk-doc/html/spice-gtk/right-insensitive.png
share/gtk-doc/html/spice-gtk/right.png
share/gtk-doc/html/spice-gtk/spice-gtk-SpiceDisplay.html
share/gtk-doc/html/spice-gtk/spice-gtk-SpiceGtkSession.html
share/gtk-doc/html/spice-gtk/spice-gtk-SpiceURI.html
share/gtk-doc/html/spice-gtk/spice-gtk-SpiceUsbDeviceWidget.html
share/gtk-doc/html/spice-gtk/spice-gtk-Utilities.html
share/gtk-doc/html/spice-gtk/spice-gtk-Version-Information.html
share/gtk-doc/html/spice-gtk/spice-gtk.devhelp2