spice-gtk: Update wip/spice-gtk to 0.39

[Dan Cîrnaț <dan%alt.md@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Dan Cîrnaț <dan%alt.md@localhost>
Pushed By:	cirnatdan
Date:		Tue Dec 7 17:59:48 2021 +0100
Changeset:	73cedf5d0b66338e4f50747bdee031d75f5f40b0

Modified Files:
	spice-gtk/Makefile
	spice-gtk/PLIST
	spice-gtk/distinfo
Added Files:
	spice-gtk/buildlink3.mk
	spice-gtk/patches/patch-subprojects_spice-common_meson.build
	spice-gtk/patches/patch-vapi_meson.build
Removed Files:
	spice-gtk/patches/patch-configure

Log Message:
spice-gtk: Update wip/spice-gtk to 0.39

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=73cedf5d0b66338e4f50747bdee031d75f5f40b0

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 spice-gtk/Makefile                                 | 16 ++++++++++++----
 spice-gtk/PLIST                                    | 21 +++++++++++++++++----
 spice-gtk/buildlink3.mk                            | 22 ++++++++++++++++++++++
 spice-gtk/distinfo                                 |  9 +++++----
 spice-gtk/patches/patch-configure                  | 15 ---------------
 .../patch-subprojects_spice-common_meson.build     | 15 +++++++++++++++
 spice-gtk/patches/patch-vapi_meson.build           | 22 ++++++++++++++++++++++
 7 files changed, 93 insertions(+), 27 deletions(-)

diffs:
diff --git a/spice-gtk/Makefile b/spice-gtk/Makefile
index 4a94cf760c..f27937393b 100644
--- a/spice-gtk/Makefile
+++ b/spice-gtk/Makefile
@@ -1,22 +1,30 @@
 # $NetBSD$
 
-DISTNAME=	spice-gtk-0.37
+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@localhost
 HOMEPAGE=	https://www.spice-space.org/spice-gtk.html
 COMMENT=	GTK+ widget for SPICE clients
 LICENSE=	gnu-lgpl-v2.1
 
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake pkg-config
+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_VERSIONED_DEPENDENCIES+=	pyparsing
+
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
+.include "../../lang/python/versioned_dependencies.mk"
+.include "../../devel/meson/build.mk"
 .include "../../audio/libopus/buildlink3.mk"
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
diff --git a/spice-gtk/PLIST b/spice-gtk/PLIST
index 877a47138d..cccb58c94a 100644
--- a/spice-gtk/PLIST
+++ b/spice-gtk/PLIST
@@ -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
@@ -48,10 +56,12 @@ 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
@@ -70,8 +80,6 @@ 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
@@ -82,3 +90,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
diff --git a/spice-gtk/buildlink3.mk b/spice-gtk/buildlink3.mk
new file mode 100644
index 0000000000..edf2cec5eb
--- /dev/null
+++ b/spice-gtk/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.5 2021/11/15 22:54:00 wiz Exp $
+
+BUILDLINK_TREE+=	spice-gtk
+
+.if !defined(SPICE_GTK_BUILDLINK3_MK)
+SPICE_GTK_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.spice-gtk+=	spice-gtk>=0.39
+BUILDLINK_ABI_DEPENDS.spice-gtk?=	spice-gtk>=0.39
+BUILDLINK_PKGSRCDIR.spice-gtk?=		../../wip/spice-gtk
+
+.include "../../audio/libopus/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../multimedia/gst-plugins1-base/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../sysutils/spice-protocol/buildlink3.mk"
+.include "../../textproc/json-glib/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
+.include "../../x11/pixman/buildlink3.mk"
+.endif	# SPICE_GTK_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-spice-gtk
diff --git a/spice-gtk/distinfo b/spice-gtk/distinfo
index b2b7cd6a6f..8792f9d3ab 100644
--- a/spice-gtk/distinfo
+++ b/spice-gtk/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
-RMD160 (spice-gtk-0.37.tar.bz2) = d984cabeb1cf4b4ae055cc7a8480574a7cbbf753
-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_meson.build) = aa5274b68f64ea08ba91da2f28dbbfc0e8a3c841
+SHA1 (patch-vapi_meson.build) = ab38cab9efb27a59874f45679e2bc6e63512ec0c
diff --git a/spice-gtk/patches/patch-configure b/spice-gtk/patches/patch-configure
deleted file mode 100644
index 573d66f0ea..0000000000
--- a/spice-gtk/patches/patch-configure
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Fix shell portability issue.
-
---- configure.orig	2019-05-16 11:50:44.000000000 +0000
-+++ configure
-@@ -20397,7 +20397,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--    if test "x$VAPIGEN" == "xno"; then
-+    if test "x$VAPIGEN" = "xno"; then
-         as_fn_error $? "Cannot find the \"vapigen\" binary in your PATH" "$LINENO" 5
-     fi
- 
diff --git a/spice-gtk/patches/patch-subprojects_spice-common_meson.build b/spice-gtk/patches/patch-subprojects_spice-common_meson.build
new file mode 100644
index 0000000000..1ab51cfc57
--- /dev/null
+++ b/spice-gtk/patches/patch-subprojects_spice-common_meson.build
@@ -0,0 +1,15 @@
+$NetBSD$
+
+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
diff --git a/spice-gtk/patches/patch-vapi_meson.build b/spice-gtk/patches/patch-vapi_meson.build
new file mode 100644
index 0000000000..ba1fab4034
--- /dev/null
+++ b/spice-gtk/patches/patch-vapi_meson.build
@@ -0,0 +1,22 @@
+$NetBSD$
+
+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