[Python-modules-commits] r14562 - in packages/pyside/trunk/debian/patches (8 files)

odyx-guest at users.alioth.debian.org odyx-guest at users.alioth.debian.org
Tue Oct 12 10:26:04 UTC 2010


    Date: Tuesday, October 12, 2010 @ 10:26:02
  Author: odyx-guest
Revision: 14562

Patches: Remove upstreams and refresh customs.

Modified:
  packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
  packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
  packages/pyside/trunk/debian/patches/series
  packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch
Deleted:
  packages/pyside/trunk/debian/patches/u_0ba776e_fix_bugs_282_283.patch
  packages/pyside/trunk/debian/patches/u_20e226b_fix_missing_qcoreapplication_arguments_method.patch
  packages/pyside/trunk/debian/patches/u_268bf77_fixed_signal_signature_parser.patch
  packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch

Modified: packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
===================================================================
--- packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch	2010-10-12 10:26:02 UTC (rev 14562)
@@ -5,9 +5,9 @@
 Last-Update: 2010-08-04
 Index: pyside/CMakeLists.txt
 ===================================================================
---- pyside.orig/CMakeLists.txt	2010-08-04 21:53:36.000000000 +0200
-+++ pyside/CMakeLists.txt	2010-08-04 21:55:01.000000000 +0200
-@@ -160,7 +160,7 @@
+--- pyside.orig/CMakeLists.txt	2010-09-14 11:01:26.000000000 +0200
++++ pyside/CMakeLists.txt	2010-09-14 11:01:26.000000000 +0200
+@@ -171,7 +171,7 @@
  endif()
  
  

Modified: packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch	2010-10-12 10:26:02 UTC (rev 14562)
@@ -7,8 +7,8 @@
 
 Index: pyside/libpyside/CMakeLists.txt
 ===================================================================
---- pyside.orig/libpyside/CMakeLists.txt	2010-08-03 19:06:31.000000000 +0200
-+++ pyside/libpyside/CMakeLists.txt	2010-08-04 21:51:03.000000000 +0200
+--- pyside.orig/libpyside/CMakeLists.txt	2010-09-14 10:57:23.000000000 +0200
++++ pyside/libpyside/CMakeLists.txt	2010-09-14 10:57:25.000000000 +0200
 @@ -10,6 +10,11 @@
  pyside.cpp
  )
@@ -21,7 +21,7 @@
  include_directories(${CMAKE_CURRENT_SOURCE_DIR}
                      ${SHIBOKEN_INCLUDE_DIR}
                      ${PYTHON_INCLUDE_PATH}
-@@ -58,3 +63,8 @@
+@@ -60,3 +65,8 @@
          DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake"
          DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")

Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/series	2010-10-12 10:26:02 UTC (rev 14562)
@@ -1,7 +1,3 @@
-u_c130273_fix_py25_QtScript_property.patch
-u_20e226b_fix_missing_qcoreapplication_arguments_method.patch
-u_268bf77_fixed_signal_signature_parser.patch
-u_0ba776e_fix_bugs_282_283.patch
 libPythonVersionPostfix.patch
 usePySpecificShiboken.patch
 lessBuildVerbosity.patch

Deleted: packages/pyside/trunk/debian/patches/u_0ba776e_fix_bugs_282_283.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_0ba776e_fix_bugs_282_283.patch	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/u_0ba776e_fix_bugs_282_283.patch	2010-10-12 10:26:02 UTC (rev 14562)
@@ -1,126 +0,0 @@
-From 0ba776e27a8c17727fa883eed29f60bc6c0bb7be Mon Sep 17 00:00:00 2001
-From: Hugo Parente Lima <hugo.pl at gmail.com>
-Date: Wed, 8 Sep 2010 15:08:41 -0300
-Subject: [PATCH] Fix bug#282 and bug#283.
-
----
- tests/util/httpd.py |   84 ++++++++++++++++++++++++++++++++++++++++++++++-----
- 1 files changed, 76 insertions(+), 8 deletions(-)
-
-diff --git a/tests/util/httpd.py b/tests/util/httpd.py
-index 96750f0..4d7dde9 100644
---- a/tests/util/httpd.py
-+++ b/tests/util/httpd.py
-@@ -1,10 +1,11 @@
- import SocketServer
- import BaseHTTPServer
-+import os
-+import sys
-+import threading
-+import select
- import random
- 
--from threading import Thread
--
--
- class TestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-     DATA = "PySide Server"
- 
-@@ -42,22 +43,89 @@ class TestSecureHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-             self.send_header("Content-Length", str(len(TestHandler.DATA)))
-             self.end_headers()
- 
-+# Workaround for the missing shutdown method in python2.5
-+class CompatTCPServer(SocketServer.TCPServer):
-+    def __init__(self, server_address, RequestHandlerClass):
-+        SocketServer.TCPServer.__init__(self, server_address, RequestHandlerClass)
-+
-+        self.isPy25 = sys.version_info[0] == 2 and sys.version_info[1] == 5
-+        if self.isPy25:
-+            self.__is_shut_down = threading.Event()
-+            self.__serving = False
-+
-+    def serve_forever(self, poll_interval=0.5):
-+        """Handle one request at a time until shutdown.
-+
-+        Polls for shutdown every poll_interval seconds. Ignores
-+        self.timeout. If you need to do periodic tasks, do them in
-+        another thread.
-+        """
-+        if self.isPy25:
-+            self.__serving = True
-+            self.__is_shut_down.clear()
-+            while self.__serving:
-+                # XXX: Consider using another file descriptor or
-+                # connecting to the socket to wake this up instead of
-+                # polling. Polling reduces our responsiveness to a
-+                # shutdown request and wastes cpu at all other times.
-+                r, w, e = select.select([self], [], [], poll_interval)
-+                if r:
-+                    self.py25_handle_request_noblock()
-+            self.__is_shut_down.set()
-+        else:
-+            SocketServer.TCPServer.serve_forever(self, poll_interval)
-+
-+    def py25_handle_request_noblock(self):
-+        """Handle one request, without blocking.
-+
-+        I assume that select.select has returned that the socket is
-+        readable before this function was called, so there should be
-+        no risk of blocking in get_request().
-+        """
-+        if self.isPy25:
-+            try:
-+                request, client_address = self.get_request()
-+            except socket.error:
-+                return
-+            if self.verify_request(request, client_address):
-+                try:
-+                    self.process_request(request, client_address)
-+                except:
-+                    self.handle_error(request, client_address)
-+                    self.close_request(request)
- 
--class TestServer(Thread):
-+    def shutdown(self):
-+        """Stops the serve_forever loop.
-+
-+        Blocks until the loop has finished. This must be called while
-+        serve_forever() is running in another thread, or it will
-+        deadlock.
-+        """
-+        if self.isPy25:
-+            self.__serving = False
-+            if not self.__is_shut_down:
-+                self.__is_shut_down.wait()
-+        else:
-+            SocketServer.TCPServer.shutdown(self)
-+
-+
-+class TestServer(threading.Thread):
- 
-     def __init__(self, secure=False):
--        Thread.__init__(self)
-+        threading.Thread.__init__(self)
- 
--        self._port = 8000 + random.randint(0, 100)
-+        self._port = int(os.getenv("PYSIDE_TESTSERVER_PORT") or 12321)
-         self.keep_running = True
--        server = SocketServer.TCPServer
- 
-         if secure:
-             handle = TestSecureHandler
-         else:
-             handle = TestHandler
- 
--        self.httpd = SocketServer.TCPServer((''  , self._port), handle)
-+        try:
-+            self.httpd = CompatTCPServer((''  , self._port), handle)
-+        except:
-+            self.httpd = CompatTCPServer((''  , self._port + random.randint(1, 100)), handle)
- 
-     def port(self):
-         return self._port
--- 
-1.6.1
-

Deleted: packages/pyside/trunk/debian/patches/u_20e226b_fix_missing_qcoreapplication_arguments_method.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_20e226b_fix_missing_qcoreapplication_arguments_method.patch	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/u_20e226b_fix_missing_qcoreapplication_arguments_method.patch	2010-10-12 10:26:02 UTC (rev 14562)
@@ -1,26 +0,0 @@
-From 20e226bc663e88849cd269043ebc9b7e223d5c10 Mon Sep 17 00:00:00 2001
-From: Hugo Parente Lima <hugo.pl at gmail.com>
-Date: Wed, 25 Aug 2010 12:08:03 -0300
-Subject: [PATCH] Fix bug#303 - "Missing method: QCoreApplication.arguments()"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Reviewer: Luciano Wolf <luciano.wolf at openbossa.org>
-          Renato Araújo <renato.filho at openbossa.org>
----
- PySide/QtCore/typesystem_core.xml |    1 -
- 1 files changed, 0 insertions(+), 1 deletions(-)
-
-Index: pyside/PySide/QtCore/typesystem_core.xml
-===================================================================
---- pyside.orig/PySide/QtCore/typesystem_core.xml	2010-08-03 19:06:31.000000000 +0200
-+++ pyside/PySide/QtCore/typesystem_core.xml	2010-08-31 15:09:05.000000000 +0200
-@@ -1817,7 +1817,6 @@
-         <define-ownership owner="c++"/>
-       </modify-argument>
-     </modify-function>
--    <modify-function signature="arguments()" remove="all"/>
-   </object-type>
-   <object-type name="QSettings">
-     <extra-includes>

Deleted: packages/pyside/trunk/debian/patches/u_268bf77_fixed_signal_signature_parser.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_268bf77_fixed_signal_signature_parser.patch	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/u_268bf77_fixed_signal_signature_parser.patch	2010-10-12 10:26:02 UTC (rev 14562)
@@ -1,118 +0,0 @@
-From 268bf7735b787d2310e18b3aed262bd27b9d24c6 Mon Sep 17 00:00:00 2001
-From: Renato Filho <renato.filho at openbossa.org>
-Date: Thu, 26 Aug 2010 12:02:59 -0300
-Subject: [PATCH] Fixed signal signature parser.
-
-Fixes bug #311.
-
-Reviewer: Luciano Wolf <luciano.wolf at openbossa.org>
-          Hugo Parente Lima <hugo.pl at gmail.com>
----
- libpyside/qsignal.cpp        |   21 +++++++++++++--------
- tests/signals/CMakeLists.txt |    1 +
- tests/signals/bug_311.py     |   42 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 56 insertions(+), 8 deletions(-)
- create mode 100644 tests/signals/bug_311.py
-
-diff --git a/libpyside/qsignal.cpp b/libpyside/qsignal.cpp
-index f465a7b..6c54203 100644
---- a/libpyside/qsignal.cpp
-+++ b/libpyside/qsignal.cpp
-@@ -250,15 +250,21 @@ char* signal_get_type_name(PyObject* type)
-         char *typeName = NULL;
-         if (type->ob_type == &Shiboken::SbkBaseWrapperType_Type) {
-             Shiboken::SbkBaseWrapperType *objType = reinterpret_cast<Shiboken::SbkBaseWrapperType*>(type);
-+            Q_ASSERT(objType->original_name);
-             typeName = strdup(objType->original_name);
-         } else {
--            //tp_name return the full name
--            Shiboken::AutoDecRef otypeName(PyObject_GetAttrString(type, "__name__"));
--            typeName = strdup(PyString_AS_STRING(otypeName.object()));
--        }
--        if (Shiboken::TypeResolver::getType(typeName) == Shiboken::TypeResolver::ObjectType) {
--            typeName = reinterpret_cast<char*>(realloc(typeName, strlen(typeName) + 1));
--            typeName = strcat(typeName, "*");
-+            // Translate python types to Qt names
-+            PyTypeObject *objType = reinterpret_cast<PyTypeObject*>(type);
-+            if (objType == &PyString_Type)
-+                typeName = strdup("QString");
-+            else if (objType == &PyInt_Type)
-+                typeName = strdup("int");
-+            else if (objType == &PyLong_Type)
-+                typeName = strdup("long");
-+            else if (objType == &PyFloat_Type)
-+                typeName = strdup("qreal");
-+            else
-+                typeName = strdup("object");
-         }
-         return typeName;
-     } else if (PyString_Check(type)) {
-@@ -277,7 +283,6 @@ char* signal_build_signature(const char *name, const char *signature)
- char* signal_parse_signature(PyObject *args)
- {
-     char *signature = 0;
--
-     if (args && (PyString_Check(args) || (!PySequence_Check(args) && (args != Py_None))))
-         return signal_get_type_name(args);
- 
-diff --git a/tests/signals/CMakeLists.txt b/tests/signals/CMakeLists.txt
-index eda247d..a69aa06 100644
---- a/tests/signals/CMakeLists.txt
-+++ b/tests/signals/CMakeLists.txt
-@@ -1,4 +1,5 @@
- PYSIDE_TEST(args_dont_match_test.py)
-+PYSIDE_TEST(bug_311.py)
- PYSIDE_TEST(decorators_test.py)
- PYSIDE_TEST(invalid_callback_test.py)
- PYSIDE_TEST(lambda_gui_test.py)
-diff --git a/tests/signals/bug_311.py b/tests/signals/bug_311.py
-new file mode 100644
-index 0000000..42ed5f3
---- /dev/null
-+++ b/tests/signals/bug_311.py
-@@ -0,0 +1,42 @@
-+#!/usr/bin/env python
-+# -*- coding: utf-8 -*-
-+
-+import unittest
-+from PySide import QtCore
-+from helper import UsesQCoreApplication
-+
-+class DerivedDate(QtCore.QDate):
-+    def __init__(self,y,m,d):
-+        super(DerivedDate,self).__init__(y,m,d)
-+
-+class Emitter(QtCore.QObject):
-+    dateSignal1 = QtCore.Signal(QtCore.QDate)
-+    dateSignal2 = QtCore.Signal(DerivedDate)
-+    tupleSignal = QtCore.Signal(tuple)
-+
-+class SignaltoSignalTest(UsesQCoreApplication):
-+    def myCb(self, dt):
-+        self._dt = dt
-+
-+    def testBug(self):
-+        e = Emitter()
-+        d = DerivedDate(2010,8,24)
-+        self._dt = None
-+        e.dateSignal1.connect(self.myCb)
-+        e.dateSignal1.emit(d)
-+        self.assertEqual(self._dt, d)
-+
-+        self._dt = None
-+        e.dateSignal2.connect(self.myCb)
-+        e.dateSignal2.emit(d)
-+        self.assertEqual(self._dt, d)
-+
-+        myTuple = (5, 6, 7)
-+        self._dt = None
-+        e.tupleSignal.connect(self.myCb)
-+        e.tupleSignal.emit(myTuple)
-+        self.assertEqual(myTuple, self._dt)
-+
-+if __name__ == '__main__':
-+    unittest.main()
-+
--- 
-1.6.1
-

Deleted: packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/u_c130273_fix_py25_QtScript_property.patch	2010-10-12 10:26:02 UTC (rev 14562)
@@ -1,39 +0,0 @@
-From c130273ee0fd41be0ed756a90ab8a24934ddb7e9 Mon Sep 17 00:00:00 2001
-From: renato <renato at renato.note>
-Date: Fri, 13 Aug 2010 15:28:59 -0300
-Subject: [PATCH] Fixed arguments parser on QProperty constructor.
-
-Reviewer: Marcelo Lira <marcelo.lira at openbossa.org>
-          Luciano Wolf <luciano.wolf at openbossa.org>
----
- libpyside/qproperty.cpp |   10 +++++-----
- 1 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/libpyside/qproperty.cpp b/libpyside/qproperty.cpp
-index 781c8cf..f20c387 100644
---- a/libpyside/qproperty.cpp
-+++ b/libpyside/qproperty.cpp
-@@ -139,15 +139,15 @@ int qproperty_init(PyObject* self, PyObject* args, PyObject* kwds)
-     data->scriptable = true;
-     data->stored = true;
- 
--    static const char *kwlist[] = {"fget", "fset", "freset", "fdel", "doc",
-+    static const char *kwlist[] = {"type", "fget", "fset", "freset", "fdel", "doc",
-                                    "designable", "scriptable", "stored", "user",
-                                    "constant", "final", 0};
-     if (!PyArg_ParseTupleAndKeywords(args, kwds,
-                                      "O|OOOOsbbbbbb:QtCore.QProperty", (char**) kwlist,
--                                     &type, &data->fget, &data->fset, &data->freset,
--                                     &data->fdel, &data->doc, &data->designable,
--                                     &data->scriptable, &data->stored, &data->user,
--                                     &data->constant, &data->final))
-+                                     /*O*/&type,
-+				     /*OOOO*/ &(data->fget), &(data->fset), &(data->freset), &(data->fdel),
-+				     /*s*/&(data->doc),
-+				     /*bbbbbb*/&(data->designable), &(data->scriptable), &(data->stored), &(data->user), &(data->constant), &(data->final)))
-         return 0;
- 
-     if (!data->fset && data->fget)
--- 
-1.6.1
-

Modified: packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch
===================================================================
--- packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch	2010-10-12 05:26:59 UTC (rev 14561)
+++ packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch	2010-10-12 10:26:02 UTC (rev 14562)
@@ -5,9 +5,9 @@
 Last-Update: 2010-08-04
 Index: pyside/CMakeLists.txt
 ===================================================================
---- pyside.orig/CMakeLists.txt	2010-08-04 21:49:51.000000000 +0200
-+++ pyside/CMakeLists.txt	2010-08-04 21:53:36.000000000 +0200
-@@ -160,7 +160,7 @@
+--- pyside.orig/CMakeLists.txt	2010-09-14 10:57:23.000000000 +0200
++++ pyside/CMakeLists.txt	2010-09-14 10:57:29.000000000 +0200
+@@ -171,7 +171,7 @@
  endif()
  
  




More information about the Python-modules-commits mailing list