diff options
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch | 13 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff | 15 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff | 29 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch | 24 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.9.5/pyqt-generated.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt-4.9.5/qreal_float_support.diff (renamed from meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff) | 0 | ||||
-rw-r--r-- | meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb (renamed from meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb) | 18 |
7 files changed, 18 insertions, 93 deletions
diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch deleted file mode 100644 index 15f83d23b0..0000000000 --- a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/assistantclient-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: PyQt-x11-gpl-4.8.3/sip/QtAssistant/qassistantclient.sip -=================================================================== ---- PyQt-x11-gpl-4.8.3.orig/sip/QtAssistant/qassistantclient.sip -+++ PyQt-x11-gpl-4.8.3/sip/QtAssistant/qassistantclient.sip -@@ -33,7 +33,7 @@ - class QAssistantClient : QObject - { - %TypeHeaderCode --#include <qassistantclient.h> -+#include <QtAssistant/qassistantclient.h> - %End - - %ConvertToSubClassCode 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 @@ -Description: Fix QtHelp FTBFS with ld --no-add-needed. -Author: Felix Geyer <debfx-pkg@fobos.de> - ---- python-qt4-4.8.1.orig/configure.py -+++ python-qt4-4.8.1/configure.py -@@ -364,7 +364,8 @@ class ConfigurePyQt4: - pyqt_modules.append("QtCore") - - check_module("QtGui", "qwidget.h", "new QWidget()") -- check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")") -+ check_module("QtHelp", "qhelpengine.h", "new QHelpEngine(\"foo\")", -+ extra_libs=["QtCore"]) - check_module("QtMultimedia", "QAudioDeviceInfo", - "new QAudioDeviceInfo()") - check_module("QtNetwork", "qhostaddress.h", "new QHostAddress()") diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff deleted file mode 100644 index 96e3062471..0000000000 --- a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff +++ /dev/null @@ -1,29 +0,0 @@ -From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca@synchrotron-soleil.fr> -Date: Tue, 1 Mar 2011 21:49:23 +0100 -Subject: [PATCH] * fix the QAssitant ftbfs - ---- - configure.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.py b/configure.py -index 7ed9582..185ec9f 100644 ---- a/configure.py -+++ b/configure.py -@@ -354,10 +354,10 @@ class ConfigurePyQt4: - - if opts.mwg_ssl_dir: - ass_lib_dirs = [os.path.join(opts.mwg_ssl_dir, "lib")] -- ass_libs = ["ssleay32", "libeay32"] -+ ass_libs = ["ssleay32", "libeay32", "QtCore"] - else: - ass_lib_dirs = None -- ass_libs = None -+ ass_libs = ["QtCore"] - - # Note that the order in which we check is important for the - # consolidated module - a module's dependencies must be checked first. --- -1.7.4.1 - diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch b/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch deleted file mode 100644 index 0af5549535..0000000000 --- a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/pyqt-generated.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQSystemTrayIcon.cpp ---- PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-08-01 16:37:34.000000000 +0200 -+++ PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQSystemTrayIcon.cpp 2012-08-01 17:05:45.000000000 +0200 -@@ -957,8 +957,6 @@ - qtgui_untrack(sipCpp); - #line 959 "QtGui/sipQtGuiQSystemTrayIcon.cpp" - -- QSystemTrayIcon *sipCpp = reinterpret_cast<QSystemTrayIcon *>(sipCppV); -- - if (QThread::currentThread() == sipCpp->thread()) - delete sipCpp; - else -diff -uNr PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQGraphicsScene.cpp PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQGraphicsScene.cpp ---- PyQt-x11-gpl-4.8.4.orig/QtGui/sipQtGuiQGraphicsScene.cpp 2012-08-01 16:37:35.000000000 +0200 -+++ PyQt-x11-gpl-4.8.4/QtGui/sipQtGuiQGraphicsScene.cpp 2012-08-01 17:26:58.000000000 +0200 -@@ -4016,8 +4016,6 @@ - qtgui_untrack(sipCpp); - #line 4018 "QtGui/sipQtGuiQGraphicsScene.cpp" - -- QGraphicsScene *sipCpp = reinterpret_cast<QGraphicsScene *>(sipCppV); -- - if (QThread::currentThread() == sipCpp->thread()) - delete sipCpp; - else diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.9.5/pyqt-generated.patch b/meta-oe/recipes-devtools/python/python-pyqt-4.9.5/pyqt-generated.patch new file mode 100644 index 0000000000..6579aa4000 --- /dev/null +++ b/meta-oe/recipes-devtools/python/python-pyqt-4.9.5/pyqt-generated.patch @@ -0,0 +1,12 @@ +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 diff --git a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff b/meta-oe/recipes-devtools/python/python-pyqt-4.9.5/qreal_float_support.diff index abdf70fab0..abdf70fab0 100644 --- a/meta-oe/recipes-devtools/python/python-pyqt-4.8.4/qreal_float_support.diff +++ b/meta-oe/recipes-devtools/python/python-pyqt-4.9.5/qreal_float_support.diff diff --git a/meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb index 8bae09eef5..9feab4df8c 100644 --- a/meta-oe/recipes-devtools/python/python-pyqt_4.8.4.bb +++ b/meta-oe/recipes-devtools/python/python-pyqt_4.9.5.bb @@ -7,27 +7,21 @@ LIC_FILES_CHKSUM = "\ file://GPL_EXCEPTION.TXT;md5=b73b0be471db679533dc94781c14af58 \ file://GPL_EXCEPTION_ADDENDUM.TXT;md5=c1e04ec2aa0911061005a801abf81e40 \ file://OPENSOURCE-NOTICE.TXT;md5=6ad9123620cc04a22c394753ad4767d7 \ - file://LICENSE-MERGED-GPL2-GPL3;md5=53ced8933428255115039368cdca0aef \ - file://LICENSE.GPL2;md5=59bccd9d4dcaae9e668798337b91a022 \ - file://LICENSE.GPL3;md5=da83bb3624af9ff4808aa9ffc49fc582 \ + file://LICENSE.GPL2;md5=276c6b9cad5f85a3af3534299825feff \ + file://LICENSE.GPL3;md5=eda942b9c6ba7eb0f40fee79e94950d5 \ " DEPENDS = "sip-native python-sip" RDEPENDS_${PN} = "python-core" -SRCNAME = "pyqt" -PYQT_OE_VERSION = "Qt_4_7_1" +PYQT_OE_VERSION = "Qt_4_8_3" SRC_URI = "\ - http://www.riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${PV}.tar.gz \ - \ - file://fix_qthelp_ftbfs.diff \ - file://fix_the_QAssitant_ftbfs.diff \ - file://assistantclient-fix.patch \ + ${SOURCEFORGE_MIRROR}/pyqt/PyQt-x11-gpl-${PV}.tar.gz \ file://pyqt-generated.patch;apply=no \ " -SRC_URI[md5sum] = "97c5dc1042feb5b3fe20baabad055af1" -SRC_URI[sha256sum] = "fcfa3ecc0b4fad6d93227751b36a6f81ea104ee19dd26905f52de59f060b3e98" +SRC_URI[md5sum] = "e4cdd6619c63655f7510efb4df8462fb" +SRC_URI[sha256sum] = "75ff0a3a088ae22c4d6e8adb242f7e593104af93933cbdd9900bc7b06f46191e" S = "${WORKDIR}/PyQt-x11-gpl-${PV}" # arm and mips machines need some extra patches |