From 0232c56f395b4ffe8e24c0913a371c5c3aa69628 Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 18 May 2019 15:10:46 +0200 Subject: [PATCH] spice-gtk: update to 0.37. Closes #11800. Signed-off-by: Enno Boland --- srcpkgs/spice-gtk/patches/fix-cross.patch | 41 ------------------- .../spice-gtk/patches/fix-vapi-build.patch | 35 ---------------- srcpkgs/spice-gtk/patches/fix-version.patch | 24 +---------- srcpkgs/spice-gtk/template | 7 ++-- 4 files changed, 5 insertions(+), 102 deletions(-) delete mode 100644 srcpkgs/spice-gtk/patches/fix-cross.patch delete mode 100644 srcpkgs/spice-gtk/patches/fix-vapi-build.patch diff --git a/srcpkgs/spice-gtk/patches/fix-cross.patch b/srcpkgs/spice-gtk/patches/fix-cross.patch deleted file mode 100644 index ee160318b73..00000000000 --- a/srcpkgs/spice-gtk/patches/fix-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/src/meson.build b/src/meson.build -index c55db44..667582b 100644 ---- src/meson.build -+++ src/meson.build -@@ -203,8 +203,8 @@ spice_client_glib_dep = declare_dependency(sources : [spice_marshals[1], spice_c - # - # SpiceClientGLib-2.0.gir - # -+if spice_gtk_has_introspection - spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib, -- build_by_default : spice_gtk_has_introspection, - export_packages : 'spice-client-glib-2.0', - extra_args : ['--accept-unprefixed'], - header : 'spice-client.h', -@@ -217,7 +217,7 @@ spice_client_glib_gir = gnome.generate_gir(spice_client_glib_lib, - namespace : 'SpiceClientGLib', - nsversion : '2.0', - sources : spice_client_glib_introspection_sources) -- -+endif - # - # spice-client-glib-usb-acl-helper - # -@@ -340,11 +340,11 @@ if spice_gtk_has_gtk - link_with : spice_client_gtk_lib, - dependencies : [spice_client_glib_dep, spice_gtk_deps]) - -+if spice_gtk_has_introspection - # - # SpiceClientGtk-3.0.gir - # - spice_client_gtk_gir = gnome.generate_gir(spice_client_gtk_lib, -- build_by_default : spice_gtk_has_introspection, - export_packages : 'spice-client-gtk-3.0', - extra_args : ['--accept-unprefixed'], - header : 'spice-widget.h', -@@ -358,3 +358,4 @@ if spice_gtk_has_gtk - nsversion : '3.0', - sources : spice_client_gtk_introspection_sources) - endif -+endif diff --git a/srcpkgs/spice-gtk/patches/fix-vapi-build.patch b/srcpkgs/spice-gtk/patches/fix-vapi-build.patch deleted file mode 100644 index 8280db10146..00000000000 --- a/srcpkgs/spice-gtk/patches/fix-vapi-build.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 432a29090c061b8567d69c576f6761904c8d228b Mon Sep 17 00:00:00 2001 -From: Rasmus Thomsen -Date: Sun, 20 Jan 2019 02:09:53 +0100 -Subject: [PATCH] meson: ensure correct build order of VAPI - -Without this commit spice-client-gtk-3.0.vapi may be built -before spice-client-glib-2.0.vapi if build_jobs > 1. This causes -the build to fail because the former depends on the latter ---- - vapi/meson.build | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/vapi/meson.build b/vapi/meson.build -index 2c4caa0..c9fef3d 100644 ---- vapi/meson.build -+++ vapi/meson.build -@@ -1,12 +1,13 @@ - if spice_gtk_has_vala -- gnome.generate_vapi('spice-client-glib-2.0', -+ spice_glib_vapi = gnome.generate_vapi('spice-client-glib-2.0', - install : true, - packages : ['gio-2.0', 'gstreamer-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-client-glib-2.0'], -+ packages : ['gtk+-3.0', 'gstreamer-1.0', spice_glib_vapi], - gir_dirs : join_paths(meson.build_root(), 'src'), - vapi_dirs : meson.current_build_dir(), - sources : spice_client_gtk_gir[0]) --- -2.20.1 - diff --git a/srcpkgs/spice-gtk/patches/fix-version.patch b/srcpkgs/spice-gtk/patches/fix-version.patch index 9f7dff9c0df..1d11986f689 100644 --- a/srcpkgs/spice-gtk/patches/fix-version.patch +++ b/srcpkgs/spice-gtk/patches/fix-version.patch @@ -1,30 +1,10 @@ -diff --git a/meson.build b/meson.build -index d7062af..93aae1a 100644 --- meson.build +++ meson.build @@ -2,7 +2,7 @@ # project definition # project('spice-gtk', 'c', -- version : run_command('build-aux/git-version-gen', '${MESON_SOURCE_ROOT}/.tarball-version', check : true).stdout().strip(), -+ version : '0.36', +- version : run_command('build-aux/git-version-gen', '@0@/.tarball-version'.format(meson.source_root()), check : true).stdout().strip(), ++ version : '0.37', license : 'LGPLv2.1', meson_version : '>= 0.49') - -diff --git a/src/meson.build b/src/meson.build -index d9614cb..2378c83 100644 ---- src/meson.build -+++ src/meson.build -@@ -8,10 +8,7 @@ spice_gtk_include += [include_directories('.')] - version_info = meson.project_version().split('.') - major = '@0@'.format(version_info[0]) - minor = '@0@'.format(version_info[1]) --micro = version_info[2].split('-')[0] --if micro == '' -- micro = '0' --endif -+micro = '0' - version_data = configuration_data() - version_data.set('SPICE_GTK_MAJOR_VERSION', major) - version_data.set('SPICE_GTK_MINOR_VERSION', minor) - diff --git a/srcpkgs/spice-gtk/template b/srcpkgs/spice-gtk/template index 05353643cbf..f7cd1d1e250 100644 --- a/srcpkgs/spice-gtk/template +++ b/srcpkgs/spice-gtk/template @@ -1,7 +1,7 @@ # Template file for 'spice-gtk' pkgname=spice-gtk -version=0.36 -revision=5 +version=0.37 +revision=1 build_style=meson build_helper="gir" configure_args="-Dintrospection=$(vopt_if gir enabled disabled) @@ -21,9 +21,8 @@ maintainer="Rasmus Thomsen " license="LGPL-2.1-or-laster" homepage="https://spice-space.org" distfiles="https://spice-space.org/download/gtk/${pkgname}-${version}.tar.bz2" -checksum=7126c3584df12d40dcf4970f5f46fafd65b757620f911687e549f7da5c8fd7cd +checksum=1f28b706472ad391cda79a93fd7b4c7a03e84b88fc46ddb35dddbe323c923bb7 -broken="https://build.voidlinux.org/builders/x86_64_builder/builds/17359/steps/shell_3/logs/stdio" CFLAGS="-Wno-error" build_options="gir vala"