merge experimental debian stuff from gramps40

2014-04-20 10:18:21 +02:00
parent 774e25b050
commit 2bdda43936
23 changed files with 121 additions and 61 deletions
--- a/debian/patches/0002-Disable-HTML-View.patch
+++ b/debian/patches/0002-Disable-HTML-View.patch
@ -0,0 +1,22 @@
+diff --git a/gramps/plugins/view/htmlrenderer.py b/gramps/plugins/view/htmlrenderer.py
+index c41942a..8f35b16 100644
+--- a/gramps/plugins/view/htmlrenderer.py
+++ b/gramps/plugins/view/htmlrenderer.py
+@@ -122,11 +122,12 @@ user_pref("general.useragent.locale, %(lang)s);
+ 
+ TOOLKIT = NOWEB
+ 
+-try:
+-    from gi.repository import WebKit as webkit
+-    TOOLKIT = WEBKIT
+-except:
+-    pass
+#Disable webkit as it is causing a crash in Gramps 4.0.2
+#try:
+#    from gi.repository import WebKit as webkit
+#    TOOLKIT = WEBKIT
+#except:
+#    pass
+ 
+ #no interfaces present, raise Error so that options for GeoView do not show
+ if TOOLKIT == NOWEB :