Update to spice-gtk-0.23.

ok jasper@ (maintainer)
This commit is contained in:
ajacoutot 2014-03-09 22:28:04 +00:00
parent 816a9c93c5
commit 914d070206
4 changed files with 43 additions and 19 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.10 2013/09/30 19:01:21 jasper Exp $
# $OpenBSD: Makefile,v 1.11 2014/03/09 22:28:04 ajacoutot Exp $
COMMENT= GTK client and libraries for SPICE remote desktop servers
DISTNAME= spice-gtk-0.20
DISTNAME= spice-gtk-0.23
CATEGORIES= x11 net
SHARED_LIBS += spice-client-glib-2.0 1.0 # 12.0
@ -20,16 +20,15 @@ MASTER_SITES= ${HOMEPAGE}/../../download/gtk/
EXTRACT_SUFX= .tar.bz2
WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
WANTLIB += c cairo cairo-gobject celt051 crypto dbus-1 dbus-glib-1
WANTLIB += expat ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
WANTLIB += gstapp-0.10 gstaudio-0.10 gstbase-0.10 gstinterfaces-0.10
WANTLIB += gstpbutils-0.10 gstreamer-0.10 gthread-2.0 gtk-3 harfbuzz
WANTLIB += jpeg m pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs
WANTLIB += sasl2 ssl xcb xcb-render xcb-shm xml2 z
WANTLIB += asn1 com_err gssapi heimbase krb5 roken wind
WANTLIB += Xinerama Xrandr Xrender asn1 atk-1.0 atk-bridge-2.0
WANTLIB += atspi c cairo cairo-gobject com_err crypto dbus-1 expat
WANTLIB += ffi fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gssapi gstapp-0.10
WANTLIB += gstaudio-0.10 gstbase-0.10 gstinterfaces-0.10 gstpbutils-0.10
WANTLIB += gstreamer-0.10 gthread-2.0 gtk-3 harfbuzz heimbase
WANTLIB += jpeg krb5 m opus pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pcre pixman-1 png pthread pthread-stubs roken sasl2
WANTLIB += ssl wind xcb xcb-render xcb-shm xml2 z
MODULES= devel/gettext \
lang/python \
@ -46,22 +45,25 @@ BUILD_DEPENDS= lang/vala \
RUN_DEPENDS= devel/spice-protocol \
sysutils/usbutils
LIB_DEPENDS= audio/celt051 \
LIB_DEPENDS= audio/opus \
multimedia/gstreamer-0.10/plugins-base \
security/cyrus-sasl2 \
x11/dbus-glib \
x11/gtk+3
USE_GMAKE= Yes
MODGNU_CONFIG_GUESS_DIRS= \
${WRKSRC} \
${WRKSRC}/spice-common \
${WRKSRC}/spice-common/spice-protocol
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-smartcard \
--disable-usbredir \
--enable-introspection \
--enable-vala \
--with-audio=gstreamer \
--with-gtk=3.0 \
--with-sasl \
--disable-gtk-doc
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

View File

@ -1,2 +1,2 @@
SHA256 (spice-gtk-0.20.tar.bz2) = sTVYI7DOsuEYwfmppgLMq3jh4u3y2T9x+kLTvIXKdd8=
SIZE (spice-gtk-0.20.tar.bz2) = 1210694
SHA256 (spice-gtk-0.23.tar.bz2) = v9+myxLEAye2MWf+cZHOlOfyonJHPIffMXkMJdYMyB0=
SIZE (spice-gtk-0.23.tar.bz2) = 1224546

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-gtk_channel-display_c,v 1.5 2014/03/09 22:28:04 ajacoutot Exp $
From 055a310f655ad436599c4fef965f2b3e7bc0f17f Mon Sep 17 00:00:00 2001
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Tue, 25 Feb 2014 10:42:47 +0000
Subject: display: fix crash when releasing primary surface
--- gtk/channel-display.c.orig Thu Feb 6 12:08:07 2014
+++ gtk/channel-display.c Mon Mar 3 16:03:10 2014
@@ -886,7 +886,7 @@ static void display_handle_mode(SpiceChannel *channel,
g_warn_if_fail(c->mark == FALSE);
- surface = spice_new0(display_surface, 1);
+ surface = g_slice_new0(display_surface);
surface->format = mode->bits == 32 ?
SPICE_SURFACE_FMT_32_xRGB : SPICE_SURFACE_FMT_16_555;
surface->width = mode->x_res;

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2013/04/28 15:11:31 jasper Exp $
@comment $OpenBSD: PLIST,v 1.4 2014/03/09 22:28:04 ajacoutot Exp $
@bin bin/spicy
@bin bin/spicy-screenshot
@bin bin/spicy-stats
@ -84,4 +84,8 @@ share/gtk-doc/html/spice-gtk/spice-gtk.devhelp2
share/gtk-doc/html/spice-gtk/style.css
share/gtk-doc/html/spice-gtk/up.png
share/locale/fr/LC_MESSAGES/spice-gtk.mo
share/vala/vapi/spice-client-glib-2.0.deps
share/vala/vapi/spice-client-glib-2.0.vapi
share/vala/vapi/spice-client-gtk-3.0.deps
share/vala/vapi/spice-client-gtk-3.0.vapi
share/vala/vapi/spice-protocol.vapi