summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorintrigeri <intrigeri@debian.org>2015-04-19 14:03:53 +0000
committerintrigeri <intrigeri@debian.org>2015-04-19 14:03:53 +0000
commite0b78a9b43e754916db64b7023a5f5d334f8a59a (patch)
treec48df31802c9a28e38d0f15cce903f5119054240
parent97c2f865b73c0f654a0550d7dda7c2140f092b19 (diff)
Always initialize DBus locking system when loading the module.
This workarounds the lack of "threads_init" function in the Python Qt DBus binding. For more details, see: <https://mailman.boum.org/pipermail/tails-dev/2012-September/001701.html>
-rw-r--r--debian/patches/Always-initialize-DBus-locking19
-rw-r--r--debian/patches/series1
2 files changed, 20 insertions, 0 deletions
diff --git a/debian/patches/Always-initialize-DBus-locking b/debian/patches/Always-initialize-DBus-locking
new file mode 100644
index 0000000..693d4e4
--- /dev/null
+++ b/debian/patches/Always-initialize-DBus-locking
@@ -0,0 +1,19 @@
+Description: Always initialize DBus locking system when loading the module.
+ This workarounds the lack of "threads_init" function in the Python Qt DBus.
+ binding. For more details, see:
+ https://mailman.boum.org/pipermail/tails-dev/2012-September/001701.html
+Author: Tails developers <tails@boum.org>
+Forwarded: no
+Last-Update: <2013-01-06>
+
+--- dbus-python-1.1.1.orig/_dbus_bindings/module.c
++++ dbus-python-1.1.1/_dbus_bindings/module.c
+@@ -264,6 +264,8 @@ init_dbus_bindings(void)
+
+ default_main_loop = NULL;
+
++ dbus_threads_init_default();
++
+ if (!dbus_py_init_generic()) goto init_error;
+ if (!dbus_py_init_abstract()) goto init_error;
+ if (!dbus_py_init_signature()) goto init_error;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b3e1a96
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Always-initialize-DBus-locking