pyside: don't forget the patches and add patch for qws

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 80 insertions, 15 deletions

diff --git a/patches/pyside-qt4.7+1.0.1/0001-only-add-qaccessibleevent_wrapper.cpp-if-accessible-.patch b/patches/pyside-qt4.7+1.0.3/0001-only-add-qaccessibleevent_wrapper.cpp-if-accessible-.patch
index 73cabee0d..deed2e7e8 100644
--- a/patches/pyside-qt4.7+1.0.1/0001-only-add-qaccessibleevent_wrapper.cpp-if-accessible-.patch
+++ b/patches/pyside-qt4.7+1.0.3/0001-only-add-qaccessibleevent_wrapper.cpp-if-accessible-.patch
@@ -1,6 +1,7 @@
 From: Michael Olbrich <m.olbrich@pengutronix.de>
 Date: Wed, 26 Jan 2011 01:20:31 +0100
-Subject: [PATCH] only add qaccessibleevent_wrapper.cpp if accessible is enabled
+Subject: [PATCH] only add qaccessibleevent_wrapper.cpp if accessible is
+ enabled
 
 Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
 ---
@@ -8,10 +9,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 files changed, 8 insertions(+), 1 deletions(-)
 
 diff --git a/PySide/QtGui/CMakeLists.txt b/PySide/QtGui/CMakeLists.txt
-index 85c61b9..f00a1f9 100644
+index 8f8ff97..143323d 100644
 --- a/PySide/QtGui/CMakeLists.txt
 +++ b/PySide/QtGui/CMakeLists.txt
-@@ -62,6 +62,13 @@ endif ()
+@@ -79,6 +79,13 @@ check_qt_class(QtGui QMacStyle                  QtGui_OPTIONAL_SRC QtGui_DROPPED
  
  qt4_wrap_cpp(QPYTEXTOBJECT_MOC "${pyside_SOURCE_DIR}/qpytextobject.h")
  
@@ -25,7 +26,7 @@ index 85c61b9..f00a1f9 100644
  set(QtGui_SRC
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractbutton_wrapper.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractgraphicsshapeitem_wrapper.cpp
-@@ -74,7 +81,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractspinbox_wrapper.cpp
+@@ -91,7 +98,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstractspinbox_wrapper.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstracttextdocumentlayout_paintcontext_wrapper.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstracttextdocumentlayout_selection_wrapper.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qabstracttextdocumentlayout_wrapper.cpp
@@ -34,6 +35,3 @@ index 85c61b9..f00a1f9 100644
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qactionevent_wrapper.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qactiongroup_wrapper.cpp
  ${CMAKE_CURRENT_BINARY_DIR}/PySide/QtGui/qaction_wrapper.cpp
--- 
-1.7.2.3
-
diff --git a/patches/pyside-qt4.7+1.0.1/0002-add-include-iostream.patch b/patches/pyside-qt4.7+1.0.3/0002-add-include-iostream.patch
index b5b059847..5d8d8467d 100644
--- a/patches/pyside-qt4.7+1.0.1/0002-add-include-iostream.patch
+++ b/patches/pyside-qt4.7+1.0.3/0002-add-include-iostream.patch
@@ -10,17 +10,14 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/libpyside/dynamicqmetaobject.cpp b/libpyside/dynamicqmetaobject.cpp
-index 6c7710f..4cbb14e 100644
+index 86190fa..439f888 100644
 --- a/libpyside/dynamicqmetaobject.cpp
 +++ b/libpyside/dynamicqmetaobject.cpp
-@@ -27,6 +27,7 @@
- #include <QList>
+@@ -35,6 +35,7 @@
+ #include <QLinkedList>
  #include <QObject>
  #include <cstring>
 +#include <iostream>
  #include <QDebug>
  #include <QMetaMethod>
  
--- 
-1.7.2.3
-
diff --git a/patches/pyside-qt4.7+1.0.3/0003-add-qws-support.patch b/patches/pyside-qt4.7+1.0.3/0003-add-qws-support.patch
new file mode 100644
index 000000000..8c6a03443
--- /dev/null
+++ b/patches/pyside-qt4.7+1.0.3/0003-add-qws-support.patch
@@ -0,0 +1,68 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon, 20 Jun 2011 21:42:41 +0200
+Subject: [PATCH] add qws support
+
+based on a patch from OpenEmbedded:
+http://cgit.openembedded.net/cgit.cgi/openembedded/tree/recipes/pyside/python-pyside-embedded/support-qws.patch
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ CMakeLists.txt                      |    4 ++++
+ PySide/QtGui/typesystem_gui_qws.xml |   26 ++++++++++++++++++++++++++
+ 2 files changed, 30 insertions(+), 0 deletions(-)
+ create mode 100644 PySide/QtGui/typesystem_gui_qws.xml
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 49c75a4..22a9c6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -89,6 +89,7 @@ set(ENABLE_X11 "0")
+ set(ENABLE_MAC "0")
+ set(ENABLE_WIN "0")
+ set(ENABLE_SIMULATOR "0")
++set(ENABLE_QWS "0")
+ if(Q_WS_X11)
+     set(ENABLE_X11 "1")
+     if(Q_WS_MAEMO_5)
+@@ -105,6 +106,9 @@ elseif(Q_WS_WIN)
+ elseif(Q_WS_SIMULATOR)
+     set(ENABLE_SIMULATOR "1")
+     set(AUTO_OS "simulator")
++elseif(Q_WS_QWS)
++    set(ENABLE_QWS "1")
++    set(AUTO_OS "qws")
+ else()
+     message(FATAL_ERROR "OS not supported")
+ endif()
+diff --git a/PySide/QtGui/typesystem_gui_qws.xml b/PySide/QtGui/typesystem_gui_qws.xml
+new file mode 100644
+index 0000000..d4a4793
+--- /dev/null
++++ b/PySide/QtGui/typesystem_gui_qws.xml
+@@ -0,0 +1,26 @@
++<?xml version="1.0"?>
++<!--
++    This file is part of PySide project.
++    Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
++    Contact: PySide team <contact@pyside.org>
++
++    This library is free software; you can redistribute it and/or
++    modify it under the terms of the GNU Lesser General Public
++    License as published by the Free Software Foundation; either
++    version 2.1 of the License, or (at your option) any later version.
++
++    This library is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++    Lesser General Public License for more details.
++
++    You should have received a copy of the GNU Lesser General Public
++    License along with this library; if not, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
++-->
++<typesystem package="PySide.QtGui">
++  <value-type name="QCursor">
++    <!-- Does not exist on QWS -->
++    <modify-function signature="QCursor(Qt::HANDLE)" remove="all"/>
++  </value-type>
++</typesystem>
diff --git a/patches/pyside-qt4.7+1.0.1/series b/patches/pyside-qt4.7+1.0.3/series
index c629f133f..c42a441b5 100644
--- a/patches/pyside-qt4.7+1.0.1/series
+++ b/patches/pyside-qt4.7+1.0.3/series
@@ -1,4 +1,5 @@
 # generated by git-ptx-patches
 0001-only-add-qaccessibleevent_wrapper.cpp-if-accessible-.patch
 0002-add-include-iostream.patch
-# 799342dd028570350d73b9ed8cc5ccb9  - git-ptx-patches magic
+0003-add-qws-support.patch
+# 04deafbc54ce850fefc3226d2e459728  - git-ptx-patches magic
diff --git a/rules/pyside.make b/rules/pyside.make
index f7ada1acf..9f57370a1 100644
--- a/rules/pyside.make
+++ b/rules/pyside.make
@@ -50,7 +50,8 @@ $(STATEDIR)/pyside.targetinstall:
 	@$(call install_fixup, pyside,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>")
 	@$(call install_fixup, pyside,DESCRIPTION,missing)
 
-	@$(call install_lib, pyside, 0, 0, 0644, libpyside)
+	@$(call install_lib, pyside, 0, 0, 0644, \
+		libpyside-python$(PYTHON_MAJORMINOR))
 	@$(call install_tree, pyside, 0, 0, \
 		$(PYSIDE_PKGDIR)/usr/lib/python2.6/site-packages/PySide, \
 		/usr/lib/python2.6/site-packages/PySide)