[Python-modules-commits] r14792 - in packages/pyside/trunk/debian (7 files)
odyx-guest at users.alioth.debian.org
odyx-guest at users.alioth.debian.org
Mon Nov 1 08:27:01 UTC 2010
Date: Monday, November 1, 2010 @ 08:26:50
Author: odyx-guest
Revision: 14792
Merge branch 'master' into trunk
Conflicts:
debian/changelog
debian/control
debian/libpyside0.4.symbols
debian/patches/lessBuildVerbosity.patch
debian/patches/libPythonVersionPostfix.patch
debian/patches/usePySpecificShiboken.patch
Modified:
packages/pyside/trunk/debian/changelog
packages/pyside/trunk/debian/control
packages/pyside/trunk/debian/dh_pycmakedeps
packages/pyside/trunk/debian/libpyside0.4.symbols
packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch
packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch
Modified: packages/pyside/trunk/debian/changelog
===================================================================
--- packages/pyside/trunk/debian/changelog 2010-10-31 16:07:44 UTC (rev 14791)
+++ packages/pyside/trunk/debian/changelog 2010-11-01 08:26:50 UTC (rev 14792)
@@ -1,7 +1,10 @@
-pyside (0.4.1-1) experimental; urgency=low
+pyside (0.4.2-1) experimental; urgency=low
- * New 0.4.1 upstream release.
- - Add some 0.4.1 symbols.
+ * New 0.4.2 upstream release.
+ - Add some 0.4.1 and 0.4.2 symbols.
+ - Bump apiextractor and shiboken B-D versions.
+ - Update patches.
+ - Update debian/dh_pycmakedeps to work with new upstream coding style.
* Patches:
- u_c130273_fix_py25_QtScript_property.patch
@@ -16,12 +19,12 @@
* Bump the B-D chain versions.
* Make sure the private.py is installed in QtCore module.
- * Build against Qt 4.7, hence release to experimental.
+ * Build against Qt 4.7.
- Add libqtwebkit-dev
- Drop QtMultimedia module.
- Add the QtDeclarative package.
- -- Didier Raboud <didier at raboud.com> Tue, 12 Oct 2010 11:42:00 +0200
+ -- Didier Raboud <didier at raboud.com> Tue, 19 Oct 2010 22:52:14 +0200
pyside (0.4.0-2) experimental; urgency=low
Modified: packages/pyside/trunk/debian/control
===================================================================
--- packages/pyside/trunk/debian/control 2010-10-31 16:07:44 UTC (rev 14791)
+++ packages/pyside/trunk/debian/control 2010-11-01 08:26:50 UTC (rev 14792)
@@ -6,8 +6,8 @@
Build-Depends: debhelper (>= 7.4.12~), cmake (>= 2.8.2), dpkg-dev (>= 1.15.6),
python-all-dev (>= 2.3.5-11), python-all-dbg (>= 2.3.5-11), python-support (>= 0.3.9),
libqt4-dev (>= 4:4.7.0~rc1), libphonon-dev, libqt4-opengl-dev (>= 4:4.7.0~rc1), libqtwebkit-dev,
- shiboken (>= 0.5.0), libshiboken-dev (>= 0.5.0), shiboken-dbg (>= 0.5.0),
- generatorrunner (>= 0.6.1), libgenrunner-dev (>= 0.6.1), libapiextractor-dev (>= 0.8.0),
+ shiboken (>= 0.5.1), libshiboken-dev (>= 0.5.1), shiboken-dbg (>= 0.5.1),
+ generatorrunner (>= 0.6.2), libgenrunner-dev (>= 0.6.2), libapiextractor-dev (>= 0.8.1),
libqt4-sql-sqlite (>= 4:4.7.0~rc1), xvfb, xauth,
phonon-backend-gstreamer
# Various Build-Depends are needed for success of the testsuite:
Modified: packages/pyside/trunk/debian/dh_pycmakedeps
===================================================================
--- packages/pyside/trunk/debian/dh_pycmakedeps 2010-10-31 16:07:44 UTC (rev 14791)
+++ packages/pyside/trunk/debian/dh_pycmakedeps 2010-11-01 08:26:50 UTC (rev 14792)
@@ -55,7 +55,9 @@
chomp;
my $line = $_;
# Dependencies
- if ( $line =~ s/add_dependencies\(${module} (.*)\)/$1/ ) {
+ # if ( $line =~ s/add_dependencies\(${module} (.*)\)/$1/ ) {
+ if ( $line =~ s/set\(${module}_deps "?(.*)"?\)/$1/ ) {
+ print ${module}."=>".$line."\n";
foreach my $module_dep (split(' ',$line)) {
my @allInstall=glob('debian/*.install');
# Find the modules packages
@@ -64,7 +66,9 @@
foreach my $opi_line (@opi_content) {
if( $opi_line =~ m/\/${module_dep}.so$/ ) {
$other_package_install =~ s/debian\/(.*)\.install/$1/;
- addsubstvar($package, "pycmakedeps:Depends", "$other_package_install (= \${binary:Version})");
+ if ( $package ne $other_package_install ) {
+ addsubstvar($package, "pycmakedeps:Depends", "$other_package_install (= \${binary:Version})");
+ }
}
}
}
Modified: packages/pyside/trunk/debian/libpyside0.4.symbols
===================================================================
--- packages/pyside/trunk/debian/libpyside0.4.symbols 2010-10-31 16:07:44 UTC (rev 14791)
+++ packages/pyside/trunk/debian/libpyside0.4.symbols 2010-11-01 08:26:50 UTC (rev 14792)
@@ -1,24 +1,39 @@
+# SymbolsHelper-Confirmed: 0.4.2 i386
libpyside-py25.so.0.4 libpyside0.4 #MINVER#
- (c++)"PySide::checkSignal(char const*)@Base" 0.3.1
+ (c++)"PySide::DynamicQMetaObject::DynamicQMetaObject(char const*, QMetaObject const*)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::addProperty(char const*, _object*)@Base" 0.4.0
(c++)"PySide::DynamicQMetaObject::addSignal(char const*, char const*)@Base" 0.3.2
(c++)"PySide::DynamicQMetaObject::addSlot(char const*, char const*)@Base" 0.3.2
(c++)"PySide::DynamicQMetaObject::createBasedOn(_object*, _typeobject*, QMetaObject const*)@Base" 0.3.2
- (c++)"PySide::DynamicQMetaObject::~DynamicQMetaObject()@Base" 0.3.1
- (c++)"PySide::DynamicQMetaObject::DynamicQMetaObject(char const*, QMetaObject const*)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::removeSignal(unsigned int)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::removeSlot(unsigned int)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::updateMetaObject()@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::writeMethodsData(QLinkedList<PySide::MethodData>&, unsigned int**, QList<QByteArray>*, int*, int, int, int)@Base" 0.4.0
+ (c++)"PySide::DynamicQMetaObject::~DynamicQMetaObject()@Base" 0.3.1
+ (c++)"PySide::PyObjectWrapper::PyObjectWrapper()@Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::PyObjectWrapper(PySide::PyObjectWrapper const&)@Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::PyObjectWrapper(_object*)@Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::operator _object*() const at Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::~PyObjectWrapper()@Base" 0.4.0
+ (c++)"PySide::SignalManager::SignalManager()@Base" 0.3.1
+ (c++)"PySide::SignalManager::addGlobalSlot(char const*, _object*)@Base" 0.3.1
+ (c++)"PySide::SignalManager::call_method(QObject*, int, void**)@Base" 0.4.0
+ (c++)"PySide::SignalManager::clear()@Base" 0.3.1
+ (c++)"PySide::SignalManager::emitSignal(QObject*, char const*, _object*)@Base" 0.3.1
+ (c++)"PySide::SignalManager::globalReceiver()@Base" 0.3.1
+ (c++)"PySide::SignalManager::globalReceiverConnectNotify(QObject*, int)@Base" 0.3.1
+ (c++)"PySide::SignalManager::globalReceiverDisconnectNotify(QObject*, int)@Base" 0.3.1
+ (c++)"PySide::SignalManager::hasConnectionWith(QObject const*)@Base" 0.3.1
+ (c++)"PySide::SignalManager::instance()@Base" 0.3.1
+ (c++)"PySide::SignalManager::qt_metacall(QObject*, QMetaObject::Call, int, void**)@Base" 0.3.1
+ (c++)"PySide::SignalManager::registerMetaMethod(QObject*, char const*, QMetaMethod::MethodType)@Base" 0.3.1
+ (c++)"PySide::SignalManager::~SignalManager()@Base" 0.3.1
+ (c++)"PySide::checkSignal(char const*)@Base" 0.3.1
+ (c++)"PySide::fillQtProperties(_object*, QMetaObject const*, _object*, char const**, unsigned int)@Base" 0.4.2
(c++)"PySide::getCallbackSignature(char const*, QObject*, _object*, bool)@Base" 0.4.0
(c++)"PySide::init(_object*)@Base" 0.3.2
(c++)"PySide::isQPropertyType(_object*)@Base" 0.4.0
(c++)"PySide::isSignal(char const*)@Base" 0.3.1
- (c++)"PySide::PyObjectWrapper::operator _object*() const at Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::~PyObjectWrapper()@Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::PyObjectWrapper()@Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::PyObjectWrapper(_object*)@Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::PyObjectWrapper(PySide::PyObjectWrapper const&)@Base" 0.4.0
(c++)"PySide::qproperty_get(_object*, _object*)@Base" 0.4.0
(c++)"PySide::qproperty_get_object(_object*, _object*)@Base" 0.4.0
(c++)"PySide::qproperty_get_type(_object*)@Base" 0.4.0
@@ -33,22 +48,12 @@
(c++)"PySide::qproperty_is_writable(_object*)@Base" 0.4.0
(c++)"PySide::qproperty_reset(_object*, _object*)@Base" 0.4.0
(c++)"PySide::qproperty_set(_object*, _object*, _object*)@Base" 0.4.0
- (c++)"PySide::signal_connect(_object*, char const*, _object*)@Base" 0.4.1
- (c++)"PySide::SignalManager::addGlobalSlot(char const*, _object*)@Base" 0.3.1
- (c++)"PySide::SignalManager::call_method(QObject*, int, void**)@Base" 0.4.0
- (c++)"PySide::SignalManager::clear()@Base" 0.3.1
- (c++)"PySide::SignalManager::emitSignal(QObject*, char const*, _object*)@Base" 0.3.1
- (c++)"PySide::SignalManager::globalReceiver()@Base" 0.3.1
- (c++)"PySide::SignalManager::globalReceiverConnectNotify(QObject*, int)@Base" 0.3.1
- (c++)"PySide::SignalManager::globalReceiverDisconnectNotify(QObject*, int)@Base" 0.3.1
- (c++)"PySide::SignalManager::hasConnectionWith(QObject const*)@Base" 0.3.1
- (c++)"PySide::SignalManager::instance()@Base" 0.3.1
- (c++)"PySide::SignalManager::qt_metacall(QObject*, QMetaObject::Call, int, void**)@Base" 0.3.1
- (c++)"PySide::SignalManager::registerMetaMethod(QObject*, char const*, QMetaMethod::MethodType)@Base" 0.3.1
- (c++)"PySide::SignalManager::~SignalManager()@Base" 0.3.1
- (c++)"PySide::SignalManager::SignalManager()@Base" 0.3.1
+ (c++)"PySide::registerCleanupFunction(void (*)())@Base" 0.4.2
+ (c++)"PySide::runCleanupFunctions()@Base" 0.4.2
(c++)"PySide::signalNew(char const*, ...)@Base" 0.3.2
(c++)"PySide::signalUpdateSource(_object*)@Base" 0.3.2
+ (c++)"PySide::signal_connect(_object*, char const*, _object*)@Base" 0.4.1
+ QProperty_Type at Base 0.4.1
(c++)"Shiboken::AutoDecRef::~AutoDecRef()@Base" 0.3.1
(c++|optional)"Shiboken::TypeResolver* Shiboken::TypeResolver::createValueTypeResolver<long long>(char const*)@Base" 0.3.1
(c++|optional)"Shiboken::TypeResolver* Shiboken::TypeResolver::createValueTypeResolver<unsigned char>(char const*)@Base" 0.3.1
@@ -57,28 +62,41 @@
(c++|optional)"Shiboken::TypeResolver* Shiboken::TypeResolver::createValueTypeResolver<unsigned short>(char const*)@Base" 0.3.1
SignalInstance_Type at Base 0.4.1
Signal_Type at Base 0.4.1
- QProperty_Type at Base 0.4.1
libpyside-py26.so.0.4 libpyside0.4 #MINVER#
- (c++)"PySide::checkSignal(char const*)@Base" 0.3.1
+ (c++)"PySide::DynamicQMetaObject::DynamicQMetaObject(char const*, QMetaObject const*)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::addProperty(char const*, _object*)@Base" 0.4.0
(c++)"PySide::DynamicQMetaObject::addSignal(char const*, char const*)@Base" 0.3.2
(c++)"PySide::DynamicQMetaObject::addSlot(char const*, char const*)@Base" 0.3.2
(c++)"PySide::DynamicQMetaObject::createBasedOn(_object*, _typeobject*, QMetaObject const*)@Base" 0.3.2
- (c++)"PySide::DynamicQMetaObject::~DynamicQMetaObject()@Base" 0.3.1
- (c++)"PySide::DynamicQMetaObject::DynamicQMetaObject(char const*, QMetaObject const*)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::removeSignal(unsigned int)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::removeSlot(unsigned int)@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::updateMetaObject()@Base" 0.3.1
(c++)"PySide::DynamicQMetaObject::writeMethodsData(QLinkedList<PySide::MethodData>&, unsigned int**, QList<QByteArray>*, int*, int, int, int)@Base" 0.4.0
+ (c++)"PySide::DynamicQMetaObject::~DynamicQMetaObject()@Base" 0.3.1
+ (c++)"PySide::PyObjectWrapper::PyObjectWrapper()@Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::PyObjectWrapper(PySide::PyObjectWrapper const&)@Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::PyObjectWrapper(_object*)@Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::operator _object*() const at Base" 0.4.0
+ (c++)"PySide::PyObjectWrapper::~PyObjectWrapper()@Base" 0.4.0
+ (c++)"PySide::SignalManager::SignalManager()@Base" 0.3.1
+ (c++)"PySide::SignalManager::addGlobalSlot(char const*, _object*)@Base" 0.3.1
+ (c++)"PySide::SignalManager::call_method(QObject*, int, void**)@Base" 0.4.0
+ (c++)"PySide::SignalManager::clear()@Base" 0.3.1
+ (c++)"PySide::SignalManager::emitSignal(QObject*, char const*, _object*)@Base" 0.3.1
+ (c++)"PySide::SignalManager::globalReceiver()@Base" 0.3.1
+ (c++)"PySide::SignalManager::globalReceiverConnectNotify(QObject*, int)@Base" 0.3.1
+ (c++)"PySide::SignalManager::globalReceiverDisconnectNotify(QObject*, int)@Base" 0.3.1
+ (c++)"PySide::SignalManager::hasConnectionWith(QObject const*)@Base" 0.3.1
+ (c++)"PySide::SignalManager::instance()@Base" 0.3.1
+ (c++)"PySide::SignalManager::qt_metacall(QObject*, QMetaObject::Call, int, void**)@Base" 0.3.1
+ (c++)"PySide::SignalManager::registerMetaMethod(QObject*, char const*, QMetaMethod::MethodType)@Base" 0.3.1
+ (c++)"PySide::SignalManager::~SignalManager()@Base" 0.3.1
+ (c++)"PySide::checkSignal(char const*)@Base" 0.3.1
+ (c++)"PySide::fillQtProperties(_object*, QMetaObject const*, _object*, char const**, unsigned int)@Base" 0.4.2
(c++)"PySide::getCallbackSignature(char const*, QObject*, _object*, bool)@Base" 0.4.0
(c++)"PySide::init(_object*)@Base" 0.3.2
(c++)"PySide::isQPropertyType(_object*)@Base" 0.4.0
(c++)"PySide::isSignal(char const*)@Base" 0.3.1
- (c++)"PySide::PyObjectWrapper::operator _object*() const at Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::~PyObjectWrapper()@Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::PyObjectWrapper()@Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::PyObjectWrapper(_object*)@Base" 0.4.0
- (c++)"PySide::PyObjectWrapper::PyObjectWrapper(PySide::PyObjectWrapper const&)@Base" 0.4.0
(c++)"PySide::qproperty_get(_object*, _object*)@Base" 0.4.0
(c++)"PySide::qproperty_get_object(_object*, _object*)@Base" 0.4.0
(c++)"PySide::qproperty_get_type(_object*)@Base" 0.4.0
@@ -93,22 +111,12 @@
(c++)"PySide::qproperty_is_writable(_object*)@Base" 0.4.0
(c++)"PySide::qproperty_reset(_object*, _object*)@Base" 0.4.0
(c++)"PySide::qproperty_set(_object*, _object*, _object*)@Base" 0.4.0
- (c++)"PySide::signal_connect(_object*, char const*, _object*)@Base" 0.4.1
- (c++)"PySide::SignalManager::addGlobalSlot(char const*, _object*)@Base" 0.3.1
- (c++)"PySide::SignalManager::call_method(QObject*, int, void**)@Base" 0.4.0
- (c++)"PySide::SignalManager::clear()@Base" 0.3.1
- (c++)"PySide::SignalManager::emitSignal(QObject*, char const*, _object*)@Base" 0.3.1
- (c++)"PySide::SignalManager::globalReceiver()@Base" 0.3.1
- (c++)"PySide::SignalManager::globalReceiverConnectNotify(QObject*, int)@Base" 0.3.1
- (c++)"PySide::SignalManager::globalReceiverDisconnectNotify(QObject*, int)@Base" 0.3.1
- (c++)"PySide::SignalManager::hasConnectionWith(QObject const*)@Base" 0.3.1
- (c++)"PySide::SignalManager::instance()@Base" 0.3.1
- (c++)"PySide::SignalManager::qt_metacall(QObject*, QMetaObject::Call, int, void**)@Base" 0.3.1
- (c++)"PySide::SignalManager::registerMetaMethod(QObject*, char const*, QMetaMethod::MethodType)@Base" 0.3.1
- (c++)"PySide::SignalManager::~SignalManager()@Base" 0.3.1
- (c++)"PySide::SignalManager::SignalManager()@Base" 0.3.1
+ (c++)"PySide::registerCleanupFunction(void (*)())@Base" 0.4.2
+ (c++)"PySide::runCleanupFunctions()@Base" 0.4.2
(c++)"PySide::signalNew(char const*, ...)@Base" 0.3.2
(c++)"PySide::signalUpdateSource(_object*)@Base" 0.3.2
+ (c++)"PySide::signal_connect(_object*, char const*, _object*)@Base" 0.4.1
+ QProperty_Type at Base 0.4.1
(c++)"Shiboken::AutoDecRef::~AutoDecRef()@Base" 0.3.1
(c++|optional)"Shiboken::TypeResolver* Shiboken::TypeResolver::createValueTypeResolver<long long>(char const*)@Base" 0.3.1
(c++|optional)"Shiboken::TypeResolver* Shiboken::TypeResolver::createValueTypeResolver<unsigned char>(char const*)@Base" 0.3.1
@@ -117,4 +125,3 @@
(c++|optional)"Shiboken::TypeResolver* Shiboken::TypeResolver::createValueTypeResolver<unsigned short>(char const*)@Base" 0.3.1
SignalInstance_Type at Base 0.4.1
Signal_Type at Base 0.4.1
- QProperty_Type at Base 0.4.1
Modified: packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch
===================================================================
--- packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch 2010-10-31 16:07:44 UTC (rev 14791)
+++ packages/pyside/trunk/debian/patches/lessBuildVerbosity.patch 2010-11-01 08:26:50 UTC (rev 14792)
@@ -5,12 +5,12 @@
Last-Update: 2010-08-04
Index: pyside/CMakeLists.txt
===================================================================
---- 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 @@
+--- pyside.orig/CMakeLists.txt 2010-10-15 09:08:52.000000000 +0200
++++ pyside/CMakeLists.txt 2010-10-15 09:08:56.000000000 +0200
+@@ -178,7 +178,7 @@
+ set(PYSIDE_PYTHON_LIBRARIES "-undefined dynamic_lookup")
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-10-31 16:07:44 UTC (rev 14791)
+++ packages/pyside/trunk/debian/patches/libPythonVersionPostfix.patch 2010-11-01 08:26:50 UTC (rev 14792)
@@ -7,8 +7,8 @@
Index: pyside/libpyside/CMakeLists.txt
===================================================================
---- 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
+--- pyside.orig/libpyside/CMakeLists.txt 2010-10-15 09:09:03.000000000 +0200
++++ pyside/libpyside/CMakeLists.txt 2010-10-15 09:09:05.000000000 +0200
@@ -10,6 +10,11 @@
pyside.cpp
)
@@ -21,7 +21,7 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${SHIBOKEN_INCLUDE_DIR}
${PYTHON_INCLUDE_PATH}
-@@ -60,3 +65,8 @@
+@@ -66,3 +71,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/usePySpecificShiboken.patch
===================================================================
--- packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch 2010-10-31 16:07:44 UTC (rev 14791)
+++ packages/pyside/trunk/debian/patches/usePySpecificShiboken.patch 2010-11-01 08:26:50 UTC (rev 14792)
@@ -5,12 +5,12 @@
Last-Update: 2010-08-04
Index: pyside/CMakeLists.txt
===================================================================
---- 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 @@
+--- pyside.orig/CMakeLists.txt 2010-10-13 15:00:50.000000000 +0200
++++ pyside/CMakeLists.txt 2010-10-15 09:07:56.000000000 +0200
+@@ -178,7 +178,7 @@
+ set(PYSIDE_PYTHON_LIBRARIES "-undefined dynamic_lookup")
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