diff --git a/fix-finding-pyparsing.patch b/fix-finding-pyparsing.patch deleted file mode 100644 index 99dd37f..0000000 --- a/fix-finding-pyparsing.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3ff07d859a62e20a0fbbb4b8972bdffec09b7850 Mon Sep 17 00:00:00 2001 -From: caodongxia <315816521@qq.com> -Date: Tue, 8 Feb 2022 15:32:17 +0800 -Subject: [PATCH] fix finding pyparsing - ---- - subprojects/spice-common/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/subprojects/spice-common/meson.build b/subprojects/spice-common/meson.build -index 3123fb1..c8b40dd 100644 ---- a/subprojects/spice-common/meson.build -+++ b/subprojects/spice-common/meson.build -@@ -126,7 +126,7 @@ python = py_module.find_installation() - 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 --- -2.27.0 - diff --git a/fix-invalid-use-of-subprojects.patch b/fix-invalid-use-of-subprojects.patch deleted file mode 100644 index 595bbfc..0000000 --- a/fix-invalid-use-of-subprojects.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b3eb04485cf4553b0e588a7ca78f7377e1c4f35e Mon Sep 17 00:00:00 2001 -From: Eli Schwartz -Date: Mon, 27 Jun 2022 01:48:02 -0400 -Subject: [PATCH] fix invalid use of subprojects -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The keycodemapdb Meson subproject provides a program and a source input. -Since it is a subproject, Meson wants to sandbox that and requires it to -be explicitly exported. But this never happened -- instead, we manually -poked at files using the actual string path "subprojects/......" - -This was always a Meson sandbox violation, but Meson 0.63.0 started -noticing it and erroring out. - -Instead, do the right thing. Update the subproject to a version that has -a meson.build with actually meaningful contents -- namely, a files -variable and a found program. Then use these in order to run the needed -custom_target. - -In the process, it is also necessary to correct the argument ordering -when running keymap-gen. - -Reviewed-by: Marc-André Lureau - -diff --git a/meson.build b/meson.build -index 995268b..8ce87ae 100644 ---- a/meson.build -+++ b/meson.build -@@ -40,9 +40,10 @@ spice_common = subproject('spice-common', default_options : ['generate-code=clie - spice_gtk_config_data.merge_from(spice_common.get_variable('spice_common_config_data')) - spice_glib_deps += spice_common.get_variable('spice_common_client_dep') - --subproject('keycodemapdb') --keymapgen = files('subprojects/keycodemapdb/tools/keymap-gen') --keymapcsv = files('subprojects/keycodemapdb/data/keymaps.csv') -+keycodemapdb = subproject('keycodemapdb') -+ -+keymapgen = find_program('keymap-gen') -+keymapcsv = keycodemapdb.get_variable('keymaps_csv') - - # - # check for system headers -diff --git a/subprojects/keycodemapdb/meson.build b/subprojects/keycodemapdb/meson.build -index eb9416b..ea05720 100644 ---- a/subprojects/keycodemapdb/meson.build -+++ b/subprojects/keycodemapdb/meson.build -@@ -1 +1,7 @@ --project('keycodemapdb') -+project('keycodemapdb', meson_version: '>=0.46.0') -+ -+keymap_gen = find_program('tools/keymap-gen') -+meson.override_find_program('keymap-gen', keymap_gen) -+ -+keymaps_csv = files('data/keymaps.csv') -+ --- -2.20.1 - diff --git a/spice-gtk-0.38.tar.xz b/spice-gtk-0.38.tar.xz deleted file mode 100644 index 2875b2a..0000000 Binary files a/spice-gtk-0.38.tar.xz and /dev/null differ diff --git a/spice-gtk-0.41.tar.xz b/spice-gtk-0.41.tar.xz new file mode 100644 index 0000000..622af5b Binary files /dev/null and b/spice-gtk-0.41.tar.xz differ diff --git a/spice-gtk.spec b/spice-gtk.spec index 5b26954..d79c3f6 100644 --- a/spice-gtk.spec +++ b/spice-gtk.spec @@ -1,23 +1,23 @@ Name: spice-gtk -Version: 0.38 -Release: 4 +Version: 0.41 +Release: 1 Summary: A GIMP Toolkit (GTK+) widget for SPICE clients License: LGPLv2+ URL: https://www.spice-space.org/spice-gtk.html Source0: https://www.spice-space.org/download/gtk/%{name}-%{version}.tar.xz -Patch0000: fix-finding-pyparsing.patch -Patch0001: fix-invalid-use-of-subprojects.patch + BuildRequires: git-core meson intltool usbredir-devel >= 0.7.1 libusb1-devel >= 1.0.21 pixman-devel libjpeg-turbo-devel BuildRequires: opus-devel zlib-devel cyrus-sasl-devel libcacard-devel gobject-introspection-devel libacl-devel polkit-devel -BuildRequires: gtk-doc vala usbutils libsoup-devel >= 2.49.91 libphodav-devel lz4-devel gtk3-devel json-glib-devel +BuildRequires: gtk-doc vala usbutils libsoup3-devel libphodav-devel >= 3.0 lz4-devel gtk3-devel json-glib-devel BuildRequires: spice-protocol >= 0.14.1 gstreamer1-devel >= 1.10 gstreamer1-plugins-base-devel >= 1.10 openssl-devel python3-pyparsing +BuildRequires: python3-six gnupg2 libcap-ng-devel wayland-protocols-devel + Requires: spice-gtk3-devel = %{version}-%{release} Provides: spice-glib = %{version}-%{release} spice-gtk3 = %{version}-%{release} Provides: spice-gtk3-vala = %{version}-%{release} spice-gtk-tools = %{version}-%{release} Obsoletes: spice-gtk-python < 0.32 spice-glib < %{version}-%{release} spice-gtk3 < %{version}-%{release} Obsoletes: spice-gtk3-vala < %{version}-%{release} spice-gtk-tools < %{version}-%{release} - %description The spice-gtk packages provide a GIMP Toolkit (GTK+) widget for SPICE (Simple Protocol for Independent Computing Environments) clients. Both Virtual Machine @@ -26,9 +26,9 @@ machines using the SPICE protocol. %package devel Summary: Development files for spice-gtk -Requires: spice-glib = %{version}-%{release} spice-gtk3 = %{version}-%{release} pkgconfig glib2-devel +Requires: spice-glib = %{version}-%{release} spice-gtk3 = %{version}-%{release} pkgconfig glib2-devel gtk3-devel Provides: spice-glib-devel = %{version}-%{release} spice-gtk3-devel = %{version}-%{release} -Obsoletes: spice-glib-devel < %{version}-%{release} spice-gtk3-devel < %{version}-%{release} spice-gtk-devel < 0.32 +Obsoletes: spice-glib-devel < %{version}-%{release} spice-gtk3-devel < %{version}-%{release} spice-gtk-devel < %{version}-%{release} %description devel The spice-gtk-devel package includes header files and libraries necessary @@ -45,15 +45,11 @@ Files for help with spice-gtk. %autosetup -n %{name}-%{version} -p1 %build -%global mjpegflag -Dbuiltin-mjpeg=false -%global celt051flag -Dcelt051=disabled -%global pulseflag -Dpulse=disabled - %meson \ - %{mjpegflag} \ - %{celt051flag} \ - %{pulseflag} \ + -Dbuiltin-mjpeg=false \ + -Dpolkit=auto \ -Dusb-acl-helper-dir=%{_libexecdir}/spice-gtk-%{_arch}/ + %{nil} %meson_build @@ -91,6 +87,9 @@ Files for help with spice-gtk. %{_mandir}/man1/spice-client.1* %changelog +* Mon Jan 02 2023 lin zhang - 0.41-1 +- Update to 0.41 + * Wed Jan 18 2023 yangchenguang - 0.38-4 - fix invalid use of subprojects