diff options
| author |   Philip Balister <philip@balister.org> | 2014-12-18 13:40:45 -0500 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2015-03-16 18:26:44 -0700 |
| commit | f9480d4a2d1c5e47a29255e981d80b12f9b1edf3 (patch) | |
| tree | d20426b27b40facde4423c691c9bb716d2510fe1 /meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch | |
| parent | 853dcfa0d618dc26bd27b3a1b49494b98d6eee97 (diff) | |
| download | meta-openembedded-f9480d4a2d1c5e47a29255e981d80b12f9b1edf3.tar.gz | |
python-pyqt: Update to 4.11.3.
The configure.py script now has support for cross compiling. This
simplified the recipe substantially.
The recipe was tested with gnuradio-companion on the zedboard and
ettus-e300. This is the first time we have been able to use grc with
pyqt built with OpenEmbedded.
Build tested on armv7, x86, x86_64 and mips.
Dropped patches from previous versions.
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch')
| -rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch b/meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch deleted file mode 100644 index 6579aa4000..0000000000 --- a/meta-oe/recipes-devtools/python/python-pyqt-4.9.6/pyqt-generated.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr PyQt-x11-gpl-4.9.5.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp PyQt-x11-gpl-4.9.5/QtGui/sipQtGuiQSystemTrayIcon.cpp ---- PyQt-x11-gpl-4.9.5.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-10-01 16:48:16.496700577 +0200 -+++ PyQt-x11-gpl-4.9.5/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-10-01 21:40:43.063130099 +0200 -@@ -993,8 +993,6 @@ - qtgui_untrack(sipCpp); - #line 995 "QtGui/sipQtGuiQSystemTrayIcon.cpp" - -- QSystemTrayIcon *sipCpp = reinterpret_cast<QSystemTrayIcon *>(sipCppV); -- - if (QThread::currentThread() == sipCpp->thread()) - delete sipCpp; - else |