summarylogtreecommitdiffstats
path: root/gst-webkit-imports.patch
diff options
context:
space:
mode:
authorMuflone2017-01-22 14:30:22 +0100
committerMuflone2017-01-22 14:30:22 +0100
commiteabef4d6d102c5bc1cfc59efc01e8f1e23aa31a5 (patch)
tree4fd0ba95a0b02dcf845435c382d73b85b036df51 /gst-webkit-imports.patch
downloadaur-arista.tar.gz
Moving from community
Diffstat (limited to 'gst-webkit-imports.patch')
-rw-r--r--gst-webkit-imports.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/gst-webkit-imports.patch b/gst-webkit-imports.patch
new file mode 100644
index 000000000000..446df2d39eec
--- /dev/null
+++ b/gst-webkit-imports.patch
@@ -0,0 +1,30 @@
+diff -Naur arista-0.9.7.orig/arista-gtk arista-0.9.7/arista-gtk
+--- arista-0.9.7.orig/arista-gtk 2011-06-20 16:10:53.000000000 +0200
++++ arista-0.9.7/arista-gtk 2014-06-08 19:58:38.190311033 +0200
+@@ -59,12 +59,6 @@
+ pynotify = None
+ _log.info("Unable to import pynotify - desktop notifications disabled")
+
+-try:
+- import webkit
+-except ImportError:
+- webkit = None
+- _log.info("Unable to import webkit - in-app documentation disabled")
+-
+ import arista
+
+ _ = gettext.gettext
+@@ -2334,6 +2328,13 @@
+ import gst
+ import gst.pbutils
+
++ # FIXME: if webkit is imported before gst the whole application hangs indefinitely
++ try:
++ import webkit
++ except ImportError:
++ webkit = None
++ _log.info("Unable to import webkit - in-app documentation disabled")
++
+ arista.init()
+
+ lc_path = arista.utils.get_path("locale", default = "")