diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-08-01 14:19:43 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2012-10-02 19:29:38 +0200 |
commit | ab6cd2bb734ba738bdbacfbeb8558e89abf29748 (patch) | |
tree | 2e7bc1395ad306bbd31d61b00bdf63becc37a4e9 /meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | |
parent | a76f29b40651c9c87b5d7d1a2f450a5b013c1bcf (diff) | |
download | meta-openembedded-ab6cd2bb734ba738bdbacfbeb8558e89abf29748.tar.gz |
python-pyqt: upgrade to 4.9.5
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff')
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff deleted file mode 100644 index e7a68829ad..0000000000 --- a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Description: Fix QtHelp FTBFS with ld --no-add-needed. | ||
2 | Author: Felix Geyer <debfx-pkg@fobos.de> | ||
3 | |||
4 | --- python-qt4-4.8.1.orig/configure.py | ||
5 | +++ python-qt4-4.8.1/configure.py | ||
6 | @@ -364,7 +364,8 @@ class ConfigurePyQt4: | ||
7 | pyqt_modules.append("QtCore") | ||
8 | |||
9 | check_module("QtGui", "qwidget.h", "new QWidget()") | ||
10 | - check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") | ||
11 | + check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", | ||
12 | + extra_libs=["QtCore"]) | ||
13 | check_module("QtMultimedia", "QAudioDeviceInfo", | ||
14 | "new QAudioDeviceInfo()") | ||
15 | check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()") | ||