Skip to content

Commit

Permalink
spice-gtk: update to 0.39.
Browse files Browse the repository at this point in the history
Based on the work by Dan Cîrnaț in pkgsrc-wip.

v0.39
=====

- !33 - Remove PulseAudio backend
- !34 - Remove support to CELT codec
- !42 - Drop capabilities from usb-acl-helper binary
- !45 - #123 - Install ACL helper in libexec directory
- !48 - Add support to Wayland mouse in server mode
- !49 - #126 - Read all SASL buffer
- !54 - Add Copy & Paste support over Webdav
- !58 - Improve input and display on HiDPI displays
- !64 - Add support for Physical size display
- !69 - Fix leak on Display's surface
- !74 - Fix read overflow on (not seamless) migration code
- !75 - Fix usb redirect on connect, see [rhbz#1874740]
- !77 - Fixes buffer overflow in QUIC [CVE-2020-14355]
- Require polkit >= 0.101
- Require meson >= 0.53
- Require glib-2.0 >= 2.52

[rhbz#1874740]: https://bugzilla.redhat.com/show_bug.cgi?id=1874740
[CVE-2020-14355]: https://bugzilla.redhat.com/show_bug.cgi?id=1885566

v0.38
=====

- #108 - Add CD/DVD redirection, to allow mounting ISO images from client.
- #99 - Fix display scaling with EGL and HiDPI monitors
- #19 - Fix display corruption on HiDPI
- #82 - Various clipboard fixes & improvements, related to host/guest races &
  cltipboard managers
- [rhbz#1720532] - Fix buffer overflow on sending data with shared-folders
- [rhbz#1695618] - Fix hang over failed migration
- API: add spice_display_channel_change_preferred_video_codec_types()
- Several usbredir related fixes and code improvements
- Several video stream related fixes and code improvements
- Several shared-folder related fixes and code improvements
- file-xfer: fix stuck transfer while transfering multiple big files at once
- file-xfer: fix possible crash on Windows
- Migration: Fix metadata swap of channels
- build-sys: remove autotools (transition to meson completed)
- Require spice-protocol >= 0.14.1
- Require libusb >= 1.0.21
- Translations:
 - Update Italian
 - Add Russian

[rhbz#1720532]: https://bugzilla.redhat.com/show_bug.cgi?id=1720532
[rhbz#1695618]: https://bugzilla.redhat.com/show_bug.cgi?id=1695618
  • Loading branch information
0-wiz-0 committed Jul 11, 2022
1 parent 3313399 commit c84ba14
Show file tree
Hide file tree
Showing 8 changed files with 123 additions and 36 deletions.
27 changes: 19 additions & 8 deletions sysutils/spice-gtk/Makefile
Original file line number Diff line number Diff line change
@@ -1,28 +1,39 @@
# $NetBSD: Makefile,v 1.6 2021/12/08 16:02:40 adam Exp $
# $NetBSD: Makefile,v 1.7 2022/07/11 07:52:56 wiz Exp $

DISTNAME= spice-gtk-0.37
PKGREVISION= 5
DISTNAME= spice-gtk-0.39
CATEGORIES= sysutils
MASTER_SITES= https://www.spice-space.org/download/gtk/
EXTRACT_SUFX= .tar.bz2
EXTRACT_SUFX= .tar.xz

MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= https://www.spice-space.org/spice-gtk.html
COMMENT= GTK+ widget for SPICE clients
LICENSE= gnu-lgpl-v2.1

GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= gmake pkg-config
DEPENDS+= ${PYPKGPREFIX}-pyparsing-[0-9]*:../../devel/py-pyparsing
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
BUILD_DEPENDS+= gtk-doc-[0-9]*:../../textproc/gtk-doc
BUILD_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc

USE_TOOLS+= pkg-config
USE_PKGLOCALEDIR= yes

PKGCONFIG_OVERRIDE+= spice-client-glib-2.0.pc.in
PKGCONFIG_OVERRIDE+= spice-client-gtk-3.0.pc.in

MESON_ARGS+= -Dintrospection=enabled
MESON_ARGS+= -Dvapi=enabled

PYTHON_VERSIONS_INCOMPATIBLE= 27

.include "../../devel/gobject-introspection/buildlink3.mk"
.include "../../lang/vala/buildlink3.mk"
.include "../../devel/meson/build.mk"
.include "../../lang/python/pyversion.mk"
.include "../../audio/libopus/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
.include "../../security/openssl/buildlink3.mk"
BUILDLINK_API_DEPENDS.spice-protocol+= spice-protocol>=0.14.1
.include "../../sysutils/spice-protocol/buildlink3.mk"
.include "../../textproc/json-glib/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
Expand Down
48 changes: 43 additions & 5 deletions sysutils/spice-gtk/PLIST
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.1 2020/02/07 12:25:49 ryoon Exp $
@comment $NetBSD: PLIST,v 1.2 2022/07/11 07:52:56 wiz Exp $
bin/spicy
bin/spicy-screenshot
bin/spicy-stats
Expand Down Expand Up @@ -32,11 +32,19 @@ include/spice-client-gtk-3.0/spice-gtk-session.h
include/spice-client-gtk-3.0/spice-widget-enums.h
include/spice-client-gtk-3.0/spice-widget.h
include/spice-client-gtk-3.0/usb-device-widget.h
lib/libspice-client-glib-2.0.la
lib/libspice-client-gtk-3.0.la
lib/girepository-1.0/SpiceClientGLib-2.0.typelib
lib/girepository-1.0/SpiceClientGtk-3.0.typelib
lib/libspice-client-glib-2.0.so
lib/libspice-client-glib-2.0.so.8
lib/libspice-client-glib-2.0.so.8.7.0
lib/libspice-client-gtk-3.0.so
lib/libspice-client-gtk-3.0.so.5
lib/libspice-client-gtk-3.0.so.5.0.0
lib/pkgconfig/spice-client-glib-2.0.pc
lib/pkgconfig/spice-client-gtk-3.0.pc
man/man1/spice-client.1
share/gir-1.0/SpiceClientGLib-2.0.gir
share/gir-1.0/SpiceClientGtk-3.0.gir
share/gtk-doc/html/spice-gtk/SpiceAudio.html
share/gtk-doc/html/spice-gtk/SpiceChannel.html
share/gtk-doc/html/spice-gtk/SpiceCursorChannel.html
Expand All @@ -48,15 +56,18 @@ share/gtk-doc/html/spice-gtk/SpiceInputsChannel.html
share/gtk-doc/html/spice-gtk/SpiceMainChannel.html
share/gtk-doc/html/spice-gtk/SpicePlaybackChannel.html
share/gtk-doc/html/spice-gtk/SpicePortChannel.html
share/gtk-doc/html/spice-gtk/SpiceQmpPort.html
share/gtk-doc/html/spice-gtk/SpiceRecordChannel.html
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/SpiceURI.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
Expand All @@ -65,13 +76,35 @@ share/gtk-doc/html/spice-gtk/ch02.html
share/gtk-doc/html/spice-gtk/ch03.html
share/gtk-doc/html/spice-gtk/home.png
share/gtk-doc/html/spice-gtk/index.html
share/gtk-doc/html/spice-gtk/ix02.html
share/gtk-doc/html/spice-gtk/ix03.html
share/gtk-doc/html/spice-gtk/ix04.html
share/gtk-doc/html/spice-gtk/ix05.html
share/gtk-doc/html/spice-gtk/ix06.html
share/gtk-doc/html/spice-gtk/ix07.html
share/gtk-doc/html/spice-gtk/ix08.html
share/gtk-doc/html/spice-gtk/ix09.html
share/gtk-doc/html/spice-gtk/ix10.html
share/gtk-doc/html/spice-gtk/ix11.html
share/gtk-doc/html/spice-gtk/ix12.html
share/gtk-doc/html/spice-gtk/ix13.html
share/gtk-doc/html/spice-gtk/ix14.html
share/gtk-doc/html/spice-gtk/ix15.html
share/gtk-doc/html/spice-gtk/ix16.html
share/gtk-doc/html/spice-gtk/ix17.html
share/gtk-doc/html/spice-gtk/ix18.html
share/gtk-doc/html/spice-gtk/ix19.html
share/gtk-doc/html/spice-gtk/ix20.html
share/gtk-doc/html/spice-gtk/ix21.html
share/gtk-doc/html/spice-gtk/ix22.html
share/gtk-doc/html/spice-gtk/ix23.html
share/gtk-doc/html/spice-gtk/ix24.html
share/gtk-doc/html/spice-gtk/ix25.html
share/gtk-doc/html/spice-gtk/left-insensitive.png
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-SpiceQmpPort.html
share/gtk-doc/html/spice-gtk/spice-gtk-SpiceURI.html
share/gtk-doc/html/spice-gtk/spice-gtk-Utilities.html
share/gtk-doc/html/spice-gtk/spice-gtk-spice-version.html
share/gtk-doc/html/spice-gtk/spice-gtk.devhelp2
Expand All @@ -82,3 +115,8 @@ share/locale/cs/LC_MESSAGES/spice-gtk.mo
share/locale/de/LC_MESSAGES/spice-gtk.mo
share/locale/fr/LC_MESSAGES/spice-gtk.mo
share/locale/it/LC_MESSAGES/spice-gtk.mo
share/locale/ru/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
5 changes: 2 additions & 3 deletions sysutils/spice-gtk/buildlink3.mk
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# $NetBSD: buildlink3.mk,v 1.5 2021/11/15 22:54:00 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.6 2022/07/11 07:52:56 wiz Exp $

BUILDLINK_TREE+= spice-gtk

.if !defined(SPICE_GTK_BUILDLINK3_MK)
SPICE_GTK_BUILDLINK3_MK:=

BUILDLINK_API_DEPENDS.spice-gtk+= spice-gtk>=0.37
BUILDLINK_ABI_DEPENDS.spice-gtk?= spice-gtk>=0.37nb4
BUILDLINK_API_DEPENDS.spice-gtk+= spice-gtk>=0.39
BUILDLINK_PKGSRCDIR.spice-gtk?= ../../sysutils/spice-gtk

.include "../../audio/libopus/buildlink3.mk"
Expand Down
12 changes: 7 additions & 5 deletions sysutils/spice-gtk/distinfo
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
$NetBSD: distinfo,v 1.3 2021/10/26 11:20:13 nia Exp $
$NetBSD: distinfo,v 1.4 2022/07/11 07:52:56 wiz Exp $

BLAKE2s (spice-gtk-0.37.tar.bz2) = 149124f19fd85571ede694e96daca59c22f8dcdfbc4003d90c0bf255edc04b4e
SHA512 (spice-gtk-0.37.tar.bz2) = a0a20bc6f25337d86e57fe1fc9586c4cc84457fc8c38cdcc5a728990a69018da0fca3ab5aa63349786b5a7508c82b716c94803eefb3495cffb7df4526db2d029
Size (spice-gtk-0.37.tar.bz2) = 1303111 bytes
SHA1 (patch-configure) = 2f34b59a9efd9573a0d451ea8e20b728f6ea1e95
BLAKE2s (spice-gtk-0.39.tar.xz) = 6c78762219e820f302a8b2502a9ba40114d6eea7fc60b51a966da2dea5a30807
SHA512 (spice-gtk-0.39.tar.xz) = ff0f3ca6b10a2c415f2fa8d61464c5710aaa2a46c2c83909f146fa45f01151e756d9c3d79cb162dd3d0c1279b6ef55a67fc5c1266af2cb5b46ac1eaa0254c8d2
Size (spice-gtk-0.39.tar.xz) = 845528 bytes
SHA1 (patch-subprojects_spice-common_common_recorder_make-it-quick_config.gnu.mk) = b1b125b33292370bf46ce621f540217dd34417c7
SHA1 (patch-subprojects_spice-common_meson.build) = aa5274b68f64ea08ba91da2f28dbbfc0e8a3c841
SHA1 (patch-vapi_meson.build) = ab38cab9efb27a59874f45679e2bc6e63512ec0c
15 changes: 0 additions & 15 deletions sysutils/spice-gtk/patches/patch-configure

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$NetBSD: patch-subprojects_spice-common_common_recorder_make-it-quick_config.gnu.mk,v 1.1 2022/07/11 07:52:57 wiz Exp $

Fix unportable test(1) operator.

--- subprojects/spice-common/common/recorder/make-it-quick/config.gnu.mk.orig 2020-12-01 16:32:04.099737200 +0000
+++ subprojects/spice-common/common/recorder/make-it-quick/config.gnu.mk
@@ -215,7 +215,7 @@ MIQ_CFGTEST= "$<" -o "$<".exe > "$<".err
[ -x "$<".exe ] && \
"$<".exe > "$<".out \
$(MIQ_CFGSET)
-MIQ_CFG_PRINT= if [ $$MIQ_CFGRC == 1 ]; then \
+MIQ_CFG_PRINT= if [ $$MIQ_CFGRC = 1 ]; then \
echo "$(POS_COLOR)OK$(DEF_COLOR)"; \
else \
echo "$(ERR_COLOR)NO$(DEF_COLOR)"; \
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
$NetBSD: patch-subprojects_spice-common_meson.build,v 1.1 2022/07/11 07:52:57 wiz Exp $

Fix pyparsing import

--- subprojects/spice-common/meson.build.orig 2020-12-01 16:32:00.384746800 +0000
+++ subprojects/spice-common/meson.build
@@ -132,7 +132,7 @@ if spice_common_generate_client_code or
if get_option('python-checks')
foreach module : ['six', 'pyparsing']
message('Checking for python module @0@'.format(module))
- cmd = run_command(python, '-m', module)
+ cmd = run_command(python, '-c', 'import @0@'.format(module))
if cmd.returncode() != 0
error('Python module @0@ not found'.format(module))
endif
22 changes: 22 additions & 0 deletions sysutils/spice-gtk/patches/patch-vapi_meson.build
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
$NetBSD: patch-vapi_meson.build,v 1.1 2022/07/11 07:52:57 wiz Exp $

Fix girdirs on Linux

--- vapi/meson.build.orig 2020-12-01 16:31:58.783751000 +0000
+++ vapi/meson.build
@@ -2,13 +2,14 @@ if spice_gtk_has_vala
spice_glib_vapi = gnome.generate_vapi('spice-client-glib-2.0',
install : true,
packages : ['gio-2.0', 'gstreamer-1.0'],
+ gir_dirs: spice_gtk_datadir / 'gir-1.0',
sources : spice_client_glib_gir[0])

if spice_gtk_has_gtk
gnome.generate_vapi('spice-client-gtk-3.0',
install : true,
packages : ['gtk+-3.0', 'gstreamer-1.0', spice_glib_vapi],
- gir_dirs : meson.build_root() / 'src',
+ gir_dirs : [meson.build_root() / 'src', spice_gtk_datadir / 'gir-1.0'],
vapi_dirs : meson.current_build_dir(),
sources : spice_client_gtk_gir[0])
endif

0 comments on commit c84ba14

Please sign in to comment.