← Back to branch summary

~ubuntu-branches/ubuntu/saucy/solfege/saucy

« back to all changes in this revision

Viewing changes to debian/patches/remove-gtkhtml.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Stefano Zacchiroli
  • Date: 2009-11-24 10:01:25 UTC
  • mfrom: (2.1.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091124100125-ixbnecfj4z6kwlby
Tags: 3.14.5-2.1
http://bugs.debian.org/533993
* Non-maintainer upload.
* Ensure xmlllint does not access the net during build: new dpatch
  xmllint-nonet from Ubuntu by Alessio Treglia. (Closes: #533993)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/remove-gtkhtml.dpatch
 
1
#! /bin/sh /usr/share/dpatch/dpatch-run
 
2
## remove-gtkhtml.dpatch by  <tom@debian>
 
3
##
 
4
## All lines beginning with `## DP:' are a description of the patch.
 
5
## DP: No description.
 
6
 
 
7
@DPATCH@
 
8
diff -urNad solfege-3.14.5~/src/htmlwidget.py solfege-3.14.5/src/htmlwidget.py
 
9
--- solfege-3.14.5~/src/htmlwidget.py   2009-06-28 23:21:40.000000000 +0200
 
10
+++ solfege-3.14.5/src/htmlwidget.py    2009-09-23 04:15:52.000000000 +0200
 
11
@@ -789,8 +789,11 @@
 
12
     gtk.main()
 
13
 
 
14
 if runtime.use_gtkhtml2():
 
15
-    import gtkhtml2
 
16
-    HtmlWidget = GtkHtml2Widget
 
17
+    try:
 
18
+        import gtkhtml2
 
19
+        HtmlWidget = GtkHtml2Widget
 
20
+    except ImportError:
 
21
+        HtmlWidget = TextViewHtmlWidget
 
22
 else:
 
23
     HtmlWidget = TextViewHtmlWidget
 
24
 
 
25
diff -urNad solfege-3.14.5~/src/optionparser.py solfege-3.14.5/src/optionparser.py
 
26
--- solfege-3.14.5~/src/optionparser.py 2009-06-28 23:21:40.000000000 +0200
 
27
+++ solfege-3.14.5/src/optionparser.py  2009-09-23 04:16:15.000000000 +0200
 
28
@@ -25,7 +25,7 @@
 
29
             help=_('For debugging only: Select questions from lesson files in sequential order.'))
 
30
         self.add_option('--enable-gtkhtml', action='store_true', 
 
31
             dest='enable_gtkhtml',
 
32
-            help=_('Run using gtkhtml2 instead of the built in HTML viewer.'))
 
33
+            help=_('Run using gtkhtml2 (if available) instead of the built in HTML viewer.'))
 
34
         self.add_option('--no-cairo-widgets', action='store_true',
 
35
             dest='no_cairo_widgets',
 
36
             help=_("Do not use the cairo version of input widgets, even if we run gtk+ 2.8.0 or newer."))