~ubuntu-branches/ubuntu/raring/pybik/raring-updates

« back to all changes in this revision

Viewing changes to debian/patches/do-not-run-with-pyside.patch

  • Committer: Package Import Robot
  • Author(s): B. Clausius
  • Date: 2013-07-13 22:50:19 UTC
  • Revision ID: package-import@ubuntu.com-20130713225019-0ubztj6rxn9f0wvt
Tags: 1.0.1-1ubuntu0.1
Remove the ability to run with pyside and require pyqt4
to prevent segmentation fault in preferences dialog (LP: #1189664)

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: do not run pybik with pyside
 
2
   * Remove the ability to run with pyside and require pyqt4
 
3
     to prevent segmentation fault in preferences dialog (LP: #1189664)
 
4
Author: B. Clausius <barcc@gmx.de>
 
5
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1189664
 
6
Forwarded: not-needed
 
7
 
 
8
--- pybik-1.0.1.orig/pybiklib/main.py
 
9
+++ pybik-1.0.1/pybiklib/main.py
 
10
@@ -98,11 +98,9 @@ arg_info = [
 
11
         (['--defaultconfig'], lambda value, opts: opts.setdefault('defaultconfig', True),
 
12
                             'Print default settings to stdout and exit'),
 
13
         (['--pyside'], lambda value, opts: opts.setdefault('pyside', True),
 
14
-                            'Use PySide, cannot combined with --pyqt4'),
 
15
+                            'Does nothing'),
 
16
         (['--pyqt4'], lambda value, opts: opts.setdefault('pyqt4', True),
 
17
-                            'Use PyQt4, cannot be combined with --pyside,'
 
18
-                            ' is neither --pyside nor --pyqt4 is given, the application'
 
19
-                            ' first imports PySide and if that fails it imports PyQt4'),
 
20
+                            'Does nothing'),
 
21
         (['--pure-python'], lambda value, opts: opts.setdefault('pure-python', True),
 
22
                             'Use python module for rendering (very slow)'),
 
23
         (['--debug='], lambda value, opts: opts.setdefault('debug', value),
 
24
@@ -166,6 +164,7 @@ def parse_args(args):
 
25
                 opts.get('config-file', config.USER_SETTINGS_FILE), opts.get('defaultconfig', False))
 
26
     
 
27
 def import_ext(pythonqt, pure_python):
 
28
+    pythonqt = 'pyqt4'
 
29
     if pythonqt != 'pyqt4':
 
30
         debug.debug('Importing PySide')
 
31
         try: