summarylogtreecommitdiffstats
path: root/pyqt4_qstring_fix.patch
diff options
context:
space:
mode:
authorLeonid Bloch2017-04-06 11:20:46 +0300
committerLeonid Bloch2017-04-06 11:20:46 +0300
commit419681b12388ba9870d32c77d114167d55fbfc4c (patch)
tree3c7afbea14a4c5a7f148a3978257096f0731e91a /pyqt4_qstring_fix.patch
parentb604188eda1d1f61b5dd95d44b02756b95fbb5ac (diff)
downloadaur-419681b12388ba9870d32c77d114167d55fbfc4c.tar.gz
Fix import error when starting fabio_viewer
Also remove git from makedepends (was a remnant from when it was pulled from the repo) and replace with cython - which is needed during the build. Signed-off-by: Leonid Bloch <leonid.bloch@esrf.fr>
Diffstat (limited to 'pyqt4_qstring_fix.patch')
-rw-r--r--pyqt4_qstring_fix.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/pyqt4_qstring_fix.patch b/pyqt4_qstring_fix.patch
new file mode 100644
index 00000000000..bd04bb47cf4
--- /dev/null
+++ b/pyqt4_qstring_fix.patch
@@ -0,0 +1,17 @@
+diff -ura src/fabio-0.4.0/scripts/fabio_viewer src_new/fabio-0.4.0/scripts/fabio_viewer
+--- src/fabio-0.4.0/scripts/fabio_viewer 2016-07-15 05:00:21.000000000 -0400
++++ src_new/fabio-0.4.0/scripts/fabio_viewer 2017-04-03 22:30:59.606912706 -0400
+@@ -22,7 +22,12 @@
+ import os
+ import time
+
+-from PyQt4.QtCore import QDir, Qt, QRect, QString, QCoreApplication
++from PyQt4.QtCore import QDir, Qt, QRect, QCoreApplication
++try:
++ from PyQt4.QtCore import QString
++except ImportError:
++ QString = str
++
+ from PyQt4.QtGui import QLabel, QVBoxLayout, QWidget, QSplitter, QListWidget, \
+ QComboBox, QApplication, QStyleFactory, QHBoxLayout, \
+ QTabWidget, QPlainTextEdit, QPushButton, QGroupBox, \