Source: spice-gtk
Version: 0.39-3
Tags: pending
Followup-For: Bug #998557
Dear maintainer,
I have uploaded an NMU to DELAYED/2 to fix this issue. Please let me
know if I should cancel or delay.
Paul
diff --git a/debian/changelog b/debian/changelog
index bf8a2aa..3d72d7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+spice-gtk (0.39-3.1) unstable; urgency=medium
+
+ [ Paul Gevers ]
+ * Non-maintainer upload
+ * Add pyparsing-detection.patch (taken from upstream) to prevent FTBFS
+
+ [ Simon Chopin ]
+ * d/rules: remove the -Dcelt051=disabled option as the whole CELT
+ support has been removed upstream (Closes: #998557)
+
+ -- Paul Gevers <elb...@debian.org> Thu, 05 May 2022 22:15:35 +0200
+
spice-gtk (0.39-3) unstable; urgency=medium
* debian/control: Increased debhelper-compat to 13
diff --git a/debian/patches/pyparsing-detection.patch
b/debian/patches/pyparsing-detection.patch
new file mode 100644
index 0000000..3fd5913
--- /dev/null
+++ b/debian/patches/pyparsing-detection.patch
@@ -0,0 +1,33 @@
+From a7b5474bf808934cf0ee1107a58d5f4d97b9afbf Mon Sep 17 00:00:00 2001
+From: Frediano Ziglio <fredd...@gmail.com>
+Date: Thu, 28 Oct 2021 16:45:34 +0100
+Subject: [PATCH] build: Correctly check for Python modules
+
+Currently using Meson the command "python -m <MODULE_NAME>" is
+run. However this command instead of trying to import the module
+tried to execute it as a script failing for the updated pyparsing
+with:
+
+ /usr/bin/python3: No module named pyparsing.__main__; 'pyparsing' is a
package and cannot be directly executed
+
+So instead use "python -c 'import <MODULE_NAME>".
+Autoconf is already using that command (see m4/ax_python_module.m4).
+
+Signed-off-by: Frediano Ziglio <fredd...@gmail.com>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: spice-gtk/subprojects/spice-common/meson.build
+===================================================================
+--- spice-gtk.orig/subprojects/spice-common/meson.build
++++ spice-gtk/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/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..86fe649
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+pyparsing-detection.patch
diff --git a/debian/rules b/debian/rules
index 53672d4..83928b4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
override_dh_auto_configure:
dh_auto_configure -- \
-Dsmartcard=enabled -Dgtk=enabled \
- -Dintrospection=enabled -Dvapi=enabled -Dcelt051=disabled \
+ -Dintrospection=enabled -Dvapi=enabled \
-Dusbredir=enabled -Dpolkit=enabled \
-Dlz4=enabled -Dgtk_doc=enabled \
-Dusb-acl-helper-dir=/usr/libexec \
