[Python-modules-commits] r14127 - in packages/pyside/trunk/debian (9 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Wed Aug 4 20:01:31 UTC 2010
Date: Wednesday, August 4, 2010 @ 20:01:12
Author: odyx-guest
Revision: 14127
* Patches:
- u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
Drop, was from upstream
- u_86d0f67_fix_debug_build.patch
Drop, was from upstream
- u_c62c36a_fix_qtmultimedia_tests.patch
Drop, was from upstream
- fixTests.patch
Drop as upstream changed the tests handling completely
?\195?\151 Refresh the others
Modified:
packages/pyside/trunk/debian/changelog
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/fixTests.patch
packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch
packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch
Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/changelog 2010-08-04 20:01:12 UTC (rev 14127)
@@ -5,8 +5,19 @@
- Bump shiboken B-D to 0.4.0
- libpyside SONAME bumped to 0.4
- -- Didier Raboud <didier at raboud.com> Wed, 04 Aug 2010 21:44:40 +0200
+ * Patches:
+ - u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
+ Drop, was from upstream
+ - u_86d0f67_fix_debug_build.patch
+ Drop, was from upstream
+ - u_c62c36a_fix_qtmultimedia_tests.patch
+ Drop, was from upstream
+ - fixTests.patch
+ Drop as upstream changed the tests handling completely
+ × Refresh the others
+ -- Didier Raboud <didier at raboud.com> Wed, 04 Aug 2010 21:57:50 +0200
+
pyside (0.3.2-4) UNRELEASED; urgency=low
* Patches:
Deleted: packages/pyside/trunk/debian/patches/fixTests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/fixTests.patch 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/fixTests.patch 2010-08-04 20:01:12 UTC (rev 14127)
@@ -1,58 +0,0 @@
-Description:
- * Extend timeout to 25
- * Blacklist some modules
-Author: Didier Raboud <didier at raboud.com>
-Forwarded: http://bugs.openbossa.org/214
-Origin: vendor
-Last-Update: 2010-06-06
-
-Index: pyside/tests/CMakeLists.txt
-===================================================================
---- pyside.orig/tests/CMakeLists.txt 2010-06-21 13:51:49.000000000 +0200
-+++ pyside/tests/CMakeLists.txt 2010-06-21 13:53:50.000000000 +0200
-@@ -1,10 +1,31 @@
-
- file(GLOB TEST_FILES */*_test.py)
-
--set(test_blacklist )
-+# Debian patch
-+# blacklist non-compiled tests (upstream: #239)
-+# qtdeclarative_qdeclarativenetwork
-+# qtdeclarative_qdeclarativeview
-+# qtmaemo5_pickselector
-+# qtmaemo5_qmaemo5import
-+# qtopengl_qglbuffer
-+#set(test_blacklist qtdeclarative_qdeclarativenetwork qtdeclarative_qdeclarativeview qtmaemo5_pickselector qtmaemo5_qmaemo5import qtopengl_qglbuffer)
-+set(test_blacklist "")
-+
-+# Don't run other bugs:
-+# qtgui_qwidget (upstream: #243)
-+# Segmentation fault
-+# qtmultimedia_audio (upstream: #240)
-+# python2.6: pcm_params.c:2348: sndrv_pcm_hw_params: Assertion `err >= 0' failed.
-+# Aborted
-+# qtnetwork_udpsocket (upstream: #230)
-+# AttributeError
-+# set(test_dontrun_list qtgui_qwidget qtmultimedia_audio qtnetwork_udpsocket)
-+set(test_dontrun_list "")
-
- foreach(test_file ${TEST_FILES})
- string(REGEX MATCH "/([^/]+)//?([^/]+)_test.py" test_name ${test_file} )
-+ list(FIND test_dontrun_list ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} dont_run)
-+ if (${dont_run} EQUAL -1)
- list(FIND test_blacklist ${CMAKE_MATCH_1}_${CMAKE_MATCH_2} expect_fail)
- add_test(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} sh
- ${CMAKE_CURRENT_SOURCE_DIR}/run_test.sh
-@@ -12,10 +33,11 @@
- "${CMAKE_BINARY_DIR}:${CMAKE_CURRENT_SOURCE_DIR}/util"
- ${PYTHON_EXECUTABLE}
- ${test_file})
-- set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES TIMEOUT 5)
-+ set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES TIMEOUT 25)
- if (${expect_fail} GREATER -1)
- set_tests_properties(${CMAKE_MATCH_1}_${CMAKE_MATCH_2} PROPERTIES WILL_FAIL TRUE)
- endif(${expect_fail} GREATER -1)
-+ endif(${dont_run} EQUAL -1)
- # Should set python path here
- # Looks like it's fixed in 2.8:
- # http://www.vtk.org/Bug/print_bug_page.php?bug_id=7885
Modified: packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
===================================================================
--- packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch 2010-08-04 20:01:12 UTC (rev 14127)
@@ -2,15 +2,15 @@
Author: Didier Raboud <didier at raboud.com>
Origin: vendor
Forwarded: http://bugs.openbossa.org/249
-Last-Update: 2010-06-23
+Last-Update: 2010-08-04
Index: pyside/CMakeLists.txt
===================================================================
---- pyside.orig/CMakeLists.txt 2010-06-24 18:30:59.000000000 +0200
-+++ pyside/CMakeLists.txt 2010-06-24 18:31:30.000000000 +0200
-@@ -132,7 +132,7 @@
- add_definitions("-DPy_DEBUG")
+--- 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 @@
endif()
+
-set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
+set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic --silent)
Modified: packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
===================================================================
--- packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch 2010-08-04 20:01:12 UTC (rev 14127)
@@ -3,13 +3,13 @@
Author: Didier Raboud <didier at raboud.com>
Origin: vendor
Forwarded: no (not wanted / needed)
-Last-Update: 2010-03-26
+Last-Update: 2010-08-04
Index: pyside/libpyside/CMakeLists.txt
===================================================================
---- pyside.orig/libpyside/CMakeLists.txt 2010-06-03 16:24:14.000000000 +0200
-+++ pyside/libpyside/CMakeLists.txt 2010-06-06 19:12:41.000000000 +0200
-@@ -9,6 +9,11 @@
+--- 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
+@@ -10,6 +10,11 @@
pyside.cpp
)
@@ -21,9 +21,9 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${SHIBOKEN_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
-@@ -52,3 +57,8 @@
+@@ -58,3 +63,8 @@
DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideVersion.cmake"
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PySideConfigVersion.cmake"
DESTINATION "${LIB_INSTALL_DIR}/cmake/PySide-${BINDING_API_VERSION}")
+
+SET(CMAKE_DEBUG_POSTFIX ${OLD_CMAKE_DEBUG_POSTFIX})
Modified: packages/pyside/trunk/debian/patches/series
===================================================================
--- packages/pyside/trunk/debian/patches/series 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/series 2010-08-04 20:01:12 UTC (rev 14127)
@@ -1,7 +1,3 @@
-u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
-u_86d0f67_fix_debug_build.patch
-u_c62c36a_fix_qtmultimedia_tests.patch
libPythonVersionPostfix.patch
-fixTests.patch
usePySpecificShiboken.patch
lessBuildVerbosity.patch
Deleted: packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.patch 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/u_5ce7c94_fix_qtnetwork_udpsocket_test.patch 2010-08-04 20:01:12 UTC (rev 14127)
@@ -1,68 +0,0 @@
-From 5ce7c945367f1d673a25666c1cc3ab300b23df49 Mon Sep 17 00:00:00 2001
-From: Renato Filho <renato.filho at openbossa.org>
-Date: Thu, 17 Jun 2010 18:49:12 -0300
-Subject: [PATCH] Fixed udpsocket to work on offline computer.
-
-Reviewed: Marcelo Lira <marcelo.lira at openbossa.org>
- Luciano Wolf <luciano.wolf at openbossa.org>
----
- tests/qtnetwork/udpsocket_test.py | 25 +++++++++++--------------
- 1 files changed, 11 insertions(+), 14 deletions(-)
-
-diff --git a/tests/qtnetwork/udpsocket_test.py b/tests/qtnetwork/udpsocket_test.py
-index 26cff7f..66f8920 100644
---- a/tests/qtnetwork/udpsocket_test.py
-+++ b/tests/qtnetwork/udpsocket_test.py
-@@ -14,16 +14,13 @@ class HttpSignalsCase(unittest.TestCase):
-
- def setUp(self):
- #Acquire resources
-+ self.called = False
- self.app = QCoreApplication([])
-+
- self.socket = QUdpSocket()
-- self.socket.bind(45454)
-+
- self.server = QUdpSocket()
-- self.timer = QTimer.singleShot(1000, self.app.quit)
-- self.a = QTimer.singleShot(100, self.broadcast)
-- #self.a = QTimer()
-- #self.a.setInterval(100)
-- #QObject.connect(self.a, SIGNAL('timeout()'), self.broadcast)
-- #self.a.start()
-+ self.server.bind(QHostAddress(QHostAddress.LocalHost), 45454)
-
- def tearDown(self):
- #Release resources
-@@ -31,21 +28,21 @@ class HttpSignalsCase(unittest.TestCase):
- del self.server
- del self.app
-
-- def broadcast(self):
-- addr = QHostAddress(QHostAddress.Broadcast)
-- self.server.writeDatagram('datagram', addr, 45454)
-+ def sendPackage(self):
-+ addr = QHostAddress(QHostAddress.LocalHost)
-+ self.socket.writeDatagram('datagram', addr, 45454)
-
- def callback(self):
-- while self.socket.hasPendingDatagrams():
-- datagram, host, port = self.socket.readDatagram(
-- self.socket.pendingDatagramSize())
-+ while self.server.hasPendingDatagrams():
-+ datagram, host, port = self.server.readDatagram(self.server.pendingDatagramSize())
- self.called = True
- self.app.quit()
-
- def testDefaultArgs(self):
- #QUdpSocket.readDatagram pythonic return
- # @bug 124
-- QObject.connect(self.socket, SIGNAL('readyRead()'), self.callback)
-+ QObject.connect(self.server, SIGNAL('readyRead()'), self.callback)
-+ self.sendPackage()
- self.app.exec_()
-
- self.assert_(self.called)
---
-1.6.1
-
Deleted: packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/u_86d0f67_fix_debug_build.patch 2010-08-04 20:01:12 UTC (rev 14127)
@@ -1,32 +0,0 @@
-From 86d0f6715ed282f7fecf789a85feb03d913ea7d9 Mon Sep 17 00:00:00 2001
-From: Hugo Parente Lima <hugo.pl at gmail.com>
-Date: Mon, 21 Jun 2010 14:10:10 -0300
-Subject: [PATCH] Fix bug: "Debug build fails to run the tests (doesn't work) [_Py_AddToAllObjects: Assertion (...) failed]"
-
-Reviewer: Marcelo Lira <marcelo.lira at openbossa.org>
- Luciano Wolf <luciano.wolf at openbossa.org>
----
- CMakeLists.txt | 10 ++++++++++
- 1 files changed, 10 insertions(+), 0 deletions(-)
-
-Index: pyside/CMakeLists.txt
-===================================================================
---- pyside.orig/CMakeLists.txt 2010-06-21 13:52:14.000000000 +0200
-+++ pyside/CMakeLists.txt 2010-06-22 09:21:45.000000000 +0200
-@@ -122,6 +122,16 @@
- message(FATAL_ERROR "Could not detect Python module installation directory.")
- endif()
-
-+# Detect if the python libs were compiled in debug mode
-+execute_process(
-+ COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; \\
-+ print sysconfig.get_config_var('Py_DEBUG')"
-+ OUTPUT_VARIABLE PY_DEBUG
-+ OUTPUT_STRIP_TRAILING_WHITESPACE)
-+if (PY_DEBUG)
-+ add_definitions("-DPy_DEBUG")
-+endif()
-+
- set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
-
- enable_testing()
Deleted: packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch
===================================================================
--- packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/u_c62c36a_fix_qtmultimedia_tests.patch 2010-08-04 20:01:12 UTC (rev 14127)
@@ -1,28 +0,0 @@
-From c62c36a64dd4c0fc0cd586c5c2b3d4f97ba3f769 Mon Sep 17 00:00:00 2001
-From: Luciano Wolf <luciano.wolf at openbossa.org>
-Date: Wed, 14 Jul 2010 18:38:13 -0300
-Subject: [PATCH] Fix CMakeLists to include QtMultimedia tests + fix audio test.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-Content-Transfer-Encoding: 8bit
-
-Reviewer: Renato Araújo <renato.filho at openbossa.org>
- Marcelo Lira <marcelo.lira at openbossa.org>
----
- tests/CMakeLists.txt | 12 ++++++++++++
- tests/qtmultimedia/audio_test.py | 2 ++
- 2 files changed, 14 insertions(+), 0 deletions(-)
-
-Index: pyside/tests/qtmultimedia/audio_test.py
-===================================================================
---- pyside.orig/tests/qtmultimedia/audio_test.py 2010-06-03 16:24:14.000000000 +0200
-+++ pyside/tests/qtmultimedia/audio_test.py 2010-07-20 19:09:29.000000000 +0200
-@@ -10,6 +10,8 @@
-
- def testListDevices(self):
- for devInfo in QAudioDeviceInfo.availableDevices(QAudio.AudioOutput):
-+ if devInfo.deviceName() == 'null':
-+ continue
- fmt = QAudioFormat()
- for codec in devInfo.supportedCodecs():
- fmt.setCodec(codec)
Modified: packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch
===================================================================
--- packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch 2010-08-04 19:45:59 UTC (rev 14126)
+++ packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch 2010-08-04 20:01:12 UTC (rev 14127)
@@ -2,15 +2,15 @@
Author: Didier Raboud <didier at raboud.com>
Origin: vendor
Forwarded: not needed, distro-specific
-Last-Update: 2010-06-24
+Last-Update: 2010-08-04
Index: pyside/CMakeLists.txt
===================================================================
---- pyside.orig/CMakeLists.txt 2010-06-24 18:30:28.000000000 +0200
-+++ pyside/CMakeLists.txt 2010-06-24 18:34:45.000000000 +0200
-@@ -132,7 +132,7 @@
- add_definitions("-DPy_DEBUG")
+--- 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 @@
endif()
+
-set(GENERATOR_EXTRA_FLAGS --generatorSet=shiboken --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
+set(GENERATOR_EXTRA_FLAGS --generatorSet=/usr/lib/generatorrunner/shiboken_generator${SHIBOKEN_POSTFIX}.so --enable-parent-ctor-heuristic --enable-pyside-extensions --enable-return-value-heuristic)
More information about the Python-modules-commits
mailing list