Skip to contentSkip to conversation

python-sip: update to 4.12.2

PATCH New Eric Bénard 1 participant 2 messages May 16, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 python-sip: update to 4.12.2

4.12.1 is no more fetchable

---
 recipes/python/python-sip_4.12.1.bb |    7 -------
 recipes/python/python-sip_4.12.2.bb |    8 ++++++++
 2 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 recipes/python/python-sip_4.12.1.bb
 create mode 100644 recipes/python/python-sip_4.12.2.bb
recipes/python/python-sip_4.12.1.bb deleted +0 -7
deleted file mode 100644
index 541da44..0000000
@@ -1,7 +0,0 @@
-require python-sip.inc
-PR = "r0"
-
-SRC_URI[md5sum] = "0f8e8305b14c1812191de2e0ee22fea9"
-SRC_URI[sha256sum] = "e9d66e8830c2a58e6c17b9952710f67d495ddb84ce6f3d89400c8b52913381b5"
-
-
recipes/python/python-sip_4.12.2.bb new file +8 -0
new file mode 100644
index 0000000..0578486
@@ -0,0 +1,8 @@
+require python-sip.inc
+PR = "r0"
+
+SRC_URI[md5sum] = "9df80f88e0e4022cdd8a8891c6c38048"
+SRC_URI[sha256sum] = "3e42bea028a1713558b5b8a317af4195d3b0feaa6c179d99401a7048f1a3cec4"
+
+
+
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/2 python-pyqt: update to 4.8.4

4.8.3 is no more fetchable

---
 .../python-pyqt-4.8.3/assistantclient-fix.patch    |   13 -
 .../debian_configure_changes.diff                  |   52 ----
 .../python/python-pyqt-4.8.3/fix_qthelp_ftbfs.diff |   15 --
 .../python-pyqt-4.8.3/fix_the_QAssitant_ftbfs.diff |   29 ---
 .../python-pyqt-4.8.3/fix_uiparser_buttonbox.diff  |   20 --
 .../python-pyqt-4.8.3/qreal_float_support.diff     |  248 --------------------
 .../python-pyqt-4.8.4/assistantclient-fix.patch    |   13 +
 .../debian_configure_changes.diff                  |   52 ++++
 .../python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff |   15 ++
 .../python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff |   29 +++
 .../python-pyqt-4.8.4/fix_uiparser_buttonbox.diff  |   20 ++
 .../python-pyqt-4.8.4/qreal_float_support.diff     |  248 ++++++++++++++++++++
 recipes/python/python-pyqt_4.8.3.bb                |  108 ---------
 recipes/python/python-pyqt_4.8.4.bb                |  107 +++++++++
 14 files changed, 484 insertions(+), 485 deletions(-)
 delete mode 100644 recipes/python/python-pyqt-4.8.3/assistantclient-fix.patch
 delete mode 100644 recipes/python/python-pyqt-4.8.3/debian_configure_changes.diff
 delete mode 100644 recipes/python/python-pyqt-4.8.3/fix_qthelp_ftbfs.diff
 delete mode 100644 recipes/python/python-pyqt-4.8.3/fix_the_QAssitant_ftbfs.diff
 delete mode 100644 recipes/python/python-pyqt-4.8.3/fix_uiparser_buttonbox.diff
 delete mode 100644 recipes/python/python-pyqt-4.8.3/qreal_float_support.diff
 create mode 100644 recipes/python/python-pyqt-4.8.4/assistantclient-fix.patch
 create mode 100644 recipes/python/python-pyqt-4.8.4/debian_configure_changes.diff
 create mode 100644 recipes/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff
 create mode 100644 recipes/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff
 create mode 100644 recipes/python/python-pyqt-4.8.4/fix_uiparser_buttonbox.diff
 create mode 100644 recipes/python/python-pyqt-4.8.4/qreal_float_support.diff
 delete mode 100644 recipes/python/python-pyqt_4.8.3.bb
 create mode 100644 recipes/python/python-pyqt_4.8.4.bb
recipes/python/python-pyqt-4.8.3/assistantclient-fix.patch deleted +0 -13
deleted file mode 100644
index 15f83d2..0000000
@@ -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
recipes/python/python-pyqt-4.8.3/debian_configure_changes.diff deleted +0 -52

52 lines not on this page · raw message

recipes/python/python-pyqt-4.8.3/fix_qthelp_ftbfs.diff deleted +0 -15
deleted file mode 100644
index e7a6882..0000000
@@ -1,15 +0,0 @@
-Description: Fix QtHelp FTBFS with ld --no-add-needed.
-Author: Felix Geyer <[email protected]>
-
---- 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()")
recipes/python/python-pyqt-4.8.3/fix_the_QAssitant_ftbfs.diff deleted +0 -29
deleted file mode 100644
index 96e3062..0000000
@@ -1,29 +0,0 @@
-From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <[email protected]>
-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
-
recipes/python/python-pyqt-4.8.3/fix_uiparser_buttonbox.diff deleted +0 -20
deleted file mode 100644
index 7bb6468..0000000
@@ -1,20 +0,0 @@
-Index: python-qt4-4.8.3/pyuic/uic/uiparser.py
-===================================================================
---- python-qt4-4.8.3.orig/pyuic/uic/uiparser.py	2011-01-23 10:08:28.000000000 +0000
-+++ python-qt4-4.8.3/pyuic/uic/uiparser.py	2011-02-07 15:13:39.038141245 +0000
-@@ -228,7 +228,14 @@
-         elif isinstance(widget, QtGui.QAbstractButton):
-             bg_i18n = self.wprops.getAttribute(elem, "buttonGroup")
-             if bg_i18n is not None:
--                bg_name = bg_i18n.string
-+                # This should be handled properly in case the problem arises
-+                # elsewhere as well.
-+                try:
-+                    # We are compiling the .ui file.
-+                    bg_name = bg_i18n.string
-+                except AttributeError:
-+                    # We are loading the .ui file.
-+                    bg_name = bg_i18n
- 
-                 for bg in self.button_groups:
-                     if bg.objectName() == bg_name:
recipes/python/python-pyqt-4.8.3/qreal_float_support.diff deleted +0 -248

248 lines not on this page · raw message

recipes/python/python-pyqt-4.8.4/assistantclient-fix.patch new file +13 -0
new file mode 100644
index 0000000..15f83d2
@@ -0,0 +1,13 @@
+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
recipes/python/python-pyqt-4.8.4/debian_configure_changes.diff new file +52 -0

52 lines not on this page · raw message

recipes/python/python-pyqt-4.8.4/fix_qthelp_ftbfs.diff new file +15 -0
new file mode 100644
index 0000000..e7a6882
@@ -0,0 +1,15 @@
+Description: Fix QtHelp FTBFS with ld --no-add-needed.
+Author: Felix Geyer <[email protected]>
+
+--- 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()")
recipes/python/python-pyqt-4.8.4/fix_the_QAssitant_ftbfs.diff new file +29 -0
new file mode 100644
index 0000000..96e3062
@@ -0,0 +1,29 @@
+From aa85ab2be6be7cb3c4df68139a8271fc4c8c11c8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <[email protected]>
+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
+
recipes/python/python-pyqt-4.8.4/fix_uiparser_buttonbox.diff new file +20 -0
new file mode 100644
index 0000000..7bb6468
@@ -0,0 +1,20 @@
+Index: python-qt4-4.8.3/pyuic/uic/uiparser.py
+===================================================================
+--- python-qt4-4.8.3.orig/pyuic/uic/uiparser.py	2011-01-23 10:08:28.000000000 +0000
++++ python-qt4-4.8.3/pyuic/uic/uiparser.py	2011-02-07 15:13:39.038141245 +0000
+@@ -228,7 +228,14 @@
+         elif isinstance(widget, QtGui.QAbstractButton):
+             bg_i18n = self.wprops.getAttribute(elem, "buttonGroup")
+             if bg_i18n is not None:
+-                bg_name = bg_i18n.string
++                # This should be handled properly in case the problem arises
++                # elsewhere as well.
++                try:
++                    # We are compiling the .ui file.
++                    bg_name = bg_i18n.string
++                except AttributeError:
++                    # We are loading the .ui file.
++                    bg_name = bg_i18n
+ 
+                 for bg in self.button_groups:
+                     if bg.objectName() == bg_name:
recipes/python/python-pyqt-4.8.4/qreal_float_support.diff new file +248 -0

248 lines not on this page · raw message

recipes/python/python-pyqt_4.8.3.bb deleted +0 -108

108 lines not on this page · raw message

recipes/python/python-pyqt_4.8.4.bb new file +107 -0

107 lines not on this page · raw message

Signature · 1 line
1.7.0.4